support !XXX in readFichiersDe API, to exclude RESULT FILE from input

Funz · Oct 26, 2023 · 57bd211 · 57bd211
1 parent bee7f6d
commit 57bd211
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/org/funz/Telemac/TelemacHelper.java b/src/main/java/org/funz/Telemac/TelemacHelper.java
@@ -125,11 +125,21 @@ public static String[] readFichiersDe(File cas, String what) {
                 continue;
             }
 
-            if ((lines[i].trim().contains(fichier_de_title) || lines[i].trim().contains(file_title)) && lines[i].trim().contains(what)) {
-                if (lines[i].trim().endsWith("=")) {
-                    fde.add(lines[i + 1].replace("'", "").trim());
-                } else {
-                    fde.add(Parser.after(lines[i], "=").replace("'", "").trim());
+            if (lines[i].trim().contains(fichier_de_title) || lines[i].trim().contains(file_title)) {
+                if (what.length>0 && what.charAt(0)=='!') { // support negative 'what'
+                    if (!lines[i].trim().contains(what.substring(1))) {
+                        if (lines[i].trim().endsWith("=")) {
+                            fde.add(lines[i + 1].replace("'", "").trim());
+                        } else {
+                            fde.add(Parser.after(lines[i], "=").replace("'", "").trim());
+                        }
+                    } 
+                } else if (lines[i].trim().contains(what)) {
+                    if (lines[i].trim().endsWith("=")) {
+                        fde.add(lines[i + 1].replace("'", "").trim());
+                    } else {
+                        fde.add(Parser.after(lines[i], "=").replace("'", "").trim());
+                    }
                 }
             }
         }

diff --git a/src/main/java/org/funz/Telemac/TelemacIOPlugin.java b/src/main/java/org/funz/Telemac/TelemacIOPlugin.java
@@ -208,7 +208,7 @@ public LinkedList<File> getRelatedFiles(File cas) {
                 if (file.isFile() && file.getName().endsWith(".poi"))
                 toimport.add(file);
             }
-            String[] deps = TelemacHelper.readFichiersDe(cas, ""); // get any possible deps
+            String[] deps = TelemacHelper.readFichiersDe(cas, "!RESULT"); // get any possible deps but results
             for (String d : deps) {
                 //System.err.println("? "+d);
                 File f = new File(cas.getAbsoluteFile().getParentFile(),d);