diff --git a/src/main/java/org/funz/Telemac/TelemacHelper.java b/src/main/java/org/funz/Telemac/TelemacHelper.java index f01dace..fd54c96 100644 --- 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 index 14c1fb0..7eb742a 100644 --- a/src/main/java/org/funz/Telemac/TelemacIOPlugin.java +++ b/src/main/java/org/funz/Telemac/TelemacIOPlugin.java @@ -208,7 +208,7 @@ public LinkedList 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);