Changeset 8618

Timestamp:

2004-11-22T16:00:04+13:00 (19 years ago)

Author:

mdewsnip

Message:

Changed the "-library" option to "-local_library" in preparation for the new LocalLibraryServer class.

Location:

trunk/gli

Files:

• gli.bat (modified) (1 diff)
• src/org/greenstone/gatherer/GetOpt.java (modified) (2 diffs)
• src/org/greenstone/gatherer/util/StaticStrings.java (modified) (1 diff)

trunk/gli/gli.bat

@@ -275 +275 @@
 
 :localLib
-    "%JAVAPATH%\java" -cp classes/;GLI.jar;lib/apache.jar;lib/jp.jar;lib/qfslib.jar;lib/mail.jar;lib/activation.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -perl %PERLPATH% -library %GSDLHOME%\server.exe -wget %WGETPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
+    "%JAVAPATH%\java" -cp classes/;GLI.jar;lib/apache.jar;lib/jp.jar;lib/qfslib.jar;lib/mail.jar;lib/activation.jar org.greenstone.gatherer.GathererProg -gsdl %GSDLHOME% -perl %PERLPATH% -local_library %GSDLHOME%\server.exe -wget %WGETPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
 
     if "%GLILANG%" == "en" echo Done!

trunk/gli/src/org/greenstone/gatherer/GetOpt.java

@@ -44 +44 @@
     public String gsdl_path = null;
     public String gsdl3_path = null;
+    public String local_library_path = null;
     public String perl_path = null;
     public String site_name = null; // for GS3
@@ -183 +184 @@
             no_load = false;
             }
-            // Parse the url to a running web server, or a file
-            // path to the local library server.
-            else if(argument_name.equals(StaticStrings.LIBRARY_ARGUMENT)) {
+            // Parse the file path of the local library server
+            else if (argument_name.equals(StaticStrings.LOCAL_LIBRARY_ARGUMENT)) {
             exec_path = argument_value;
             // If there is no colon in first five characters of

trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -155 +155 @@
     static final public String LEVELS_ELEMENT                             = "Levels";
     static final public String LEVELS_STR                                 = "levels";
-    static final public String LIBRARY_ARGUMENT                           = "-library";
+    static final public String LOCAL_LIBRARY_ARGUMENT                     = "-local_library";
     static final public String LIBRARY_STR                                = "library";
     static final public String LOAD_ARGUMENT                              = "-load";