Windows InChI version use '/' for parsing options.

cdk · Jan 8, 2017 · ac87989 · ac87989
1 parent dcfa4d1
commit ac87989
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/storage/inchi/src/main/java/org/openscience/cdk/inchi/JniInChIInputAdapter.java b/storage/inchi/src/main/java/org/openscience/cdk/inchi/JniInChIInputAdapter.java
@@ -34,6 +34,16 @@ public class JniInChIInputAdapter extends JniInchiInput {
 
     public static final String FIVE_SECOND_TIMEOUT = "-W5";
 
+    /**
+     * Flag indicating windows or linux.
+     */
+    private static final boolean IS_WINDOWS = System.getProperty("os.name", "").toLowerCase().startsWith("windows");
+
+    /**
+     * Switch character for passing options. / in windows, - on other systems.
+     */
+    private static final String FLAG_CHAR = IS_WINDOWS ? "/" : "-";
+
     public JniInChIInputAdapter(String options) throws JniInchiException {
         this.options = options == null ? "" : checkOptions(options);
     }
@@ -76,27 +86,27 @@ private static String checkOptions(final String ops) throws JniInchiException {
 
             INCHI_OPTION option = INCHI_OPTION.valueOfIgnoreCase(op);
             if (option != null) {
-                sbOptions.append('-').append(option.name());
+                sbOptions.append(FLAG_CHAR).append(option.name());
                 if (tok.hasMoreTokens()) {
                     sbOptions.append(" ");
                 }
             } else if (isTimeoutOptions(op)) {
-                sbOptions.append('-').append(op);
+                sbOptions.append(FLAG_CHAR).append(op);
                 hasUserSpecifiedTimeout = true;
                 if (tok.hasMoreTokens()) {
                     sbOptions.append(" ");
                 }
             }
             // 1,5 tautomer option
             else if ("15T".equals(op)) {
-                sbOptions.append('-').append("15T");
+                sbOptions.append(FLAG_CHAR).append("15T");
                 if (tok.hasMoreTokens()) {
                     sbOptions.append(" ");
                 }
             }
             // keto-enol tautomer option
             else if ("KET".equals(op)) {
-                sbOptions.append('-').append("KET");
+                sbOptions.append(FLAG_CHAR).append("KET");
                 if (tok.hasMoreTokens()) {
                     sbOptions.append(" ");
                 }
@@ -122,7 +132,7 @@ private static String checkOptions(List<INCHI_OPTION> ops) throws JniInchiExcept
         StringBuilder sbOptions = new StringBuilder();
 
         for (INCHI_OPTION op : ops) {
-            sbOptions.append('-').append(op.name()).append(" ");
+            sbOptions.append(FLAG_CHAR).append(op.name()).append(" ");
         }
 
         if (sbOptions.length() > 0)