v1.14-0

Author: yannrichet

src/main/java/org/funz/Cast3m/Cast3mIOPlugin.java

@@ -22,6 +22,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.net.ssl.SSLKeyException;
+
 import org.funz.ioplugin.ExtendedIOPlugin;
 import org.funz.log.Log;
 import org.funz.parameter.OutputFunctionExpression;
@@ -113,7 +115,6 @@ public void setInputFiles(final File... inputfiles) {
 
                 // Look for 'TABLE'
                 final List<String> vars = new ArrayList<>(DGibiHelper.filterTable(lines, variable));
-
                 if (vars.isEmpty()) {
                     // Look for columns defined with 'EVOL MANU'
                     vars.addAll(DGibiHelper.filterEvolManu(lines, variable));
@@ -140,7 +141,6 @@ public void setInputFiles(final File... inputfiles) {
             for (final Entry<String, String> entry : excel1Vars.entrySet()) {
                 this._output.put(entry.getKey(), DGibiHelper.FILE_OUTPUT_PREFIX + entry.getValue());
             }
-
         }
     }
 

src/main/java/org/funz/Cast3m/Cast3mIOPlugin.sync-conflict-20210924-122604-CW72HYO.java

@@ -59,9 +59,9 @@ class DGibiHelper {
 
     private static final Pattern OPTI_SORT_PATTERN = DGibiHelper.compile("\\s*opti\\s+sort\\s+'([\\w\\.]+)'\\s*;");
 
-    private static final Pattern SORT_EXCE_PATTERN = DGibiHelper.compile("sort\\s+'exce(?:l)?'\\s+([\\w_]*);");
+    private static final Pattern SORT_EXCE_PATTERN = DGibiHelper.compile("sort\\s+'*exce(?:l)?'*\\s+([\\w_]*);");
 
-    private static final Pattern SORT_CHAI_PATTERN = DGibiHelper.compile("sort\\s+'chai(?:ne)?'\\s+([\\w_]*);");
+    private static final Pattern SORT_CHAI_PATTERN = DGibiHelper.compile("sort\\s+'*chai(?:ne)?'*\\s+([\\w_]*);");
 
     /**
      * @param path
@@ -192,7 +192,7 @@ private static Map<String, String> filterOptiSort(final List<String> lines, fina
             final int nextIndex = lines.indexOf(line) + 1;
 
             // look for
-            final Matcher optiMatcher = DGibiHelper.OPTI_SORT_PATTERN.matcher(line);
+            final Matcher optiMatcher = DGibiHelper.OPTI_SORT_PATTERN.matcher(line.toLowerCase());
             // this file is interesting! look the next line
             if (optiMatcher.find() && (nextIndex < lines.size())) {
                 final String filename = optiMatcher.group(1);