Changeset 15110 for gli/trunk/src/org/greenstone/gatherer/shell/GShell.java

Timestamp:

2008-03-20T20:28:02+13:00 (16 years ago)

Author:

ak19

Message:

1. rt.exec(args) is now used on Linux as well instead of its specific rt.exec(command) in order to deal with spaces in filenames. 2. Added code to work with replace_srcdoc_with_html.pl script

File:

• gli/trunk/src/org/greenstone/gatherer/shell/GShell.java (modified) (4 diffs)

gli/trunk/src/org/greenstone/gatherer/shell/GShell.java

@@ -89 +89 @@
     static final public int CONVERT = 5;
     static final public int EXPLODE = 6;
+    static final public int SRCREPLACE = 7; // for replacing source docs with their html
 
     /** Elements in status type enumeration. */
@@ -103 +104 @@
     static public String GSHELL_CONVERT = "gshell_convert";
     static public String GSHELL_EXPLODE = "gshell_explode";
+    static public String GSHELL_SRCREPLACE = "gshell_srcreplace"; // for replacing source docs with their html versions
 
     /** Determine if the given process is still executing. It does this by attempting to throw an exception - not the most efficient way, but the only one as far as I know
@@ -236 +238 @@
         Runtime rt = Runtime.getRuntime();
         Process prcs = null;
-        if (Utility.isWindows()){
-        prcs = rt.exec(args);
-        }else{
-        prcs = rt.exec(command);
-        }
-        
+      
+        prcs = rt.exec(args);
+        // If we used single argument exec, spaces in filenames or paths cause problems
+        // I.e. better to avoid: prcs = rt.exec(command);
+                
         InputStreamReader eisr = new InputStreamReader( prcs.getErrorStream(), "UTF-8" );
         InputStreamReader stdisr = new InputStreamReader( prcs.getInputStream(), "UTF-8"  );        
@@ -604 +605 @@
         name = "explode_metadata_database.pl";
         break;
+    case SRCREPLACE: // To work with replace_srcdoc_with_html.pl
+        name = "replace_srcdoc_with_html.pl";
+        break;
     default:
         name = "";