Changeset 36102 for main

Timestamp:

2022-03-11T10:03:39+13:00 (2 years ago)

Author:

kjdon

Message:

removed the defaults of localsite and library for site_name and servlet_path - these may not be accurate

File:

• main/trunk/gli/src/org/greenstone/gatherer/Configuration.java (modified) (3 diffs)

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

@@ -65 +65 @@
     /** The string identifying an argument's name attribute. */
     static final private String ARGUMENT_NAME = "name";
-    /** The name of the general Gatherer configuration file. */
+    /** The name of the general Gatherer configuration file. 
+     Gatherer will change this to configRemote if isGsdlRemote */
     static public String CONFIG_XML = "config.xml";
     static public String FEDORA_CONFIG_PREFIX = "fedora-";
@@ -81 +82 @@
     /** The name of the other arguments element. */
     static final private String OTHER = "Other";
-    /** The name of the general Gatherer configuration template. */
+    /** The name of the general Gatherer configuration template.
+    Gatherer will change this to xml/configRemote.xml if isGSDLRemote */
     static public String TEMPLATE_CONFIG_XML = "xml/config.xml";
     /** The first of three patterns used during tokenization, this pattern handles a comma separated list. */
@@ -233 +235 @@
     if (site_name == null || site_name.equals("")) {
         site_name = getString("general.site_name", true);
-        servlet_path = getString("general.servlet_path", true);
-        if (site_name.equals("")) {
-        site_name = "localsite"; // can we assume these??
-        servlet_path = "/library";
-        setString("general.site_name", true, site_name);
-        setString("general.servlet_path", true, servlet_path);
-        }
-        
+        servlet_path = getString("general.servlet_path", true);     
     } else {
         // we set the current one in the config