Changeset 37188

Timestamp:

2023-01-28T13:27:39+13:00 (15 months ago)

Author:

kjdon

Message:

added a -webswing argument to Gatherer, so its knows if its webswing, in the same way it knows if its using remote gs

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (2 diffs)
• Gatherer.java (modified) (4 diffs)
• GetOpt.java (modified) (2 diffs)
• util/StaticStrings.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -69 +69 @@
   static final public String CONFIG_XML_3 = "config3.xml";
   static final public String CONFIG_REMOTE_XML = "configRemote.xml";
-
+    static final public String CONFIG_WEBSWING_XML = "configWebswing.xml";
     static final public String TEMPLATE_CONFIG_PREFIX = "xml/";
      static final public String FEDORA_CONFIG_PREFIX = "fedora-";
@@ -641 +641 @@
     String gli_title = getString("GLI.Title", GENERAL_SETTING);
     String title = (gli_title=="") ? Gatherer.PROGRAM_NAME : gli_title;
-
+    if (Gatherer.isWebswing) {
+        title += " (webswing)";
+    }
     return title;
     }

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -128 +128 @@
     static public boolean isGsdlRemote = false;
     static public boolean isLocalLibrary = false;
+    static public boolean isWebswing = false;
 
     // for storing the original proxy settings on GLI startup    
@@ -213 +214 @@
             setCollectDirectoryPath(getGLIUserDirectoryPath() + "collect" + File.separator);
         }
+        if (go.webswing) {
+            isWebswing = true;
+        }
         // We have a local Greenstone. OR we have a gs2build folder inside 
         // the client-GLI folder (with which the Download panel becomes enabled) 
@@ -238 +242 @@
                 System.err.println("Warning: Unable to make directory: " + collect_directory);
             }
+        }
+        else if (isWebswing) {
+            Configuration.config_xml = Configuration.CONFIG_WEBSWING_XML;
         }
         else {      
@@ -415 +422 @@
                 Configuration.setString("general.library_url", true, library_url_string);
             }
-            else { // local greenstone: add shutdown hooks to forcibly stop the server on irregular termination
+            else if(!isWebswing) { // local greenstone: add shutdown hooks to forcibly stop the server on irregular termination
                 // And start up the local library server, if that's what we want
+                /// but we don't need to do this if we are webswing.
 
                 // The Java virtual machine shuts down in response to two kinds of events:

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

@@ -40 +40 @@
     public boolean no_load = false;
     public boolean use_remote_greenstone = false;
+    public boolean webswing = false;
     public boolean new_set = false;
     public boolean run_gsdl3 = false;
@@ -153 +154 @@
             //Use a remote Greenstone
             }
+            // We are running inside webswing
+            else if (argument_name.equals(StaticStrings.WEBSWING_ARGUMENT)) {
+            webswing = true;
+            }
             else if (argument_name.equals(StaticStrings.GSDL3_ARGUMENT)){
             //Use a remote Greenstone3

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

@@ -287 +287 @@
     static final public String USE_METADATA_FILES_ARGUMENT = "use_metadata_files";
     static final public String USE_REMOTE_GREENSTONE_ARGUMENT = "-use_remote_greenstone";
+    static final public String WEBSWING_ARGUMENT = "-webswing";
     static final public String URL_SEPARATOR_CHARACTER = "/";
     static final public String VALUE_ATTRIBUTE = "value";