Changeset 10330

Timestamp:

2005-07-27T16:38:09+12:00 (19 years ago)

Author:

kjdon

Message:

gsdl3 mode now has two args: -gsdl3 which is gsdl3home (the web dir) and -gsdl3src, which is the gsdl3 directory. so Configuration has an extra param to the constructor, etc

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

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

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

@@ -99 +99 @@
     /** The path to the Greenstone Suite installation directory. */
     static public String gsdl_path = "";
-    /** If we are using GLI in Greenstone 3, the path to gsdl3 directory */
+    /** If we are using GLI in Greenstone 3, the path to gsdl3 home (== web dir) */
     static public String gsdl3_path = "";
+    /** If we are using GLI in Greenstone 3, the path to gsdl3 src directory (== gsdl3 dir)*/
+    static public String gsdl3_src_path = "";
     /** The path to the PERL executable, up to and including Perl.exe. */
     static public String perl_path = "";
@@ -132 +134 @@
     /** Constructor.
      * @param gsdl_path The path to the Greenstone directory as a <strong>String</strong>.
-     * @param gsdl3_path The path to the Greenstone 3 directory as a <strong>String</strong>.
+     * @param gsdl3_path The path to the Greenstone 3 home (web) directory as a <strong>String</strong>.
+     * @param gsdl3_src_path The path to the Greenstone 3 src directory as a <strong>String</strong>.
      * @param site_name The name of the Greenstone 3 site currently in use.
      */
-    public Configuration(String gsdl_path, String gsdl3_path, String site_name)
+    public Configuration(String gsdl_path, String gsdl3_path, String gsdl3_src_path, String site_name)
     {
     super();
@@ -142 +145 @@
     this.gsdl_path = gsdl_path;
     this.gsdl3_path = gsdl3_path;
+    this.gsdl3_src_path = gsdl3_src_path;
     this.site_name = site_name;
 
@@ -679 +683 @@
 
     static public String getGS3ScriptPath() {
-    return gsdl3_path + "bin" + File.separator + "script" + File.separator;
+    return gsdl3_src_path + "bin" + File.separator + "script" + File.separator;
     }
 

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

@@ -204 +204 @@
     }
 
-    init(go.gsdl_path, go.gsdl3_path, go.local_library_path, go.library_url_string, go.debug,
+    init(go.gsdl_path, go.gsdl3_path, go.gsdl3_src_path, go.local_library_path, go.library_url_string, go.debug,
          go.perl_path, go.no_load, go.filename, go.site_name, go.servlet_path, go.wget_path);
     }
 
 
-    public void init(String gsdl_path, String gsdl3_path, String local_library_path,
+    public void init(String gsdl_path, String gsdl3_path, String gsdl3_src_path, String local_library_path,
              String library_url_string, boolean debug_enabled, String perl_path, 
              boolean no_load, String open_collection, 
@@ -218 +218 @@
     } else {
         gsdl3_path = null;
+        gsdl3_src_path = null;
     }
 
@@ -236 +237 @@
     try {
         // Load GLI config file
-        new Configuration(gsdl_path, gsdl3_path, site_name);
+        new Configuration(gsdl_path, gsdl3_path, gsdl3_src_path, site_name);
         if (Configuration.just_updated_config_xml_file) {
         // Delete the plugins.dat and classifiers.dat files
@@ -557 +558 @@
     static public String getSitesDirectoryPath()
     {
-    return Configuration.gsdl3_path + File.separator + "web" + File.separator + "sites" + File.separator;
+    return Configuration.gsdl3_path + "sites" + File.separator;
     }
 

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

@@ -42 +42 @@
     public String gsdl_path = null;
     public String gsdl3_path = null;
+    public String gsdl3_src_path = null;
     public String library_url_string = null;
     public String local_library_path = null;
@@ -154 +155 @@
             }
             }
+            // GSDL3 src path
+            if(argument_name.equals(StaticStrings.GSDL3_SRC_ARGUMENT)) {
+            if(argument_value.endsWith(File.separator)) {
+                gsdl3_src_path = argument_value;
+            }
+            else {
+                gsdl3_src_path = argument_value + File.separator;
+            }
+            }
+            
             else if (argument_name.equals(StaticStrings.SITE_ARGUMENT)) {
             site_name = argument_value;

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

@@ -67 +67 @@
     
     //String web_xml_path = gsdl3_path + File.separator + "web" + File.separator + "WEB-INF"+ File.separator + "web.xml";
-    File web_xml = new File(gsdl3_path + File.separator + "web" + File.separator + "WEB-INF"+ File.separator + "web.xml");
+    File web_xml = new File(gsdl3_path + "WEB-INF"+ File.separator + "web.xml");
 
     if (!web_xml.exists()) {

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -177 +177 @@
     this.self = this;
     JarTools.initialise(this);
-    config = new Configuration(gsdl_path, null, null);
+    config = new Configuration(gsdl_path, null, null, null);
 
     // Read Dictionary

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

@@ -116 +116 @@
     static final public String GSDL_ARGUMENT                              = "-gsdl";
     static final public String GSDL3_ARGUMENT                              = "-gsdl3";
+    static final public String GSDL3_SRC_ARGUMENT                         = "-gsdl3src";
     static final public String HFILE_ARGUMENT                             = "-hfile";
     static final public String HIDDENGLI_ELEMENT                          = "HiddenGLI";

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

@@ -443 +443 @@
 
     static public String getSitesDir(String gsdl3_path) {
-    return gsdl3_path + File.separator + "web"
-        + File.separator + "sites" + File.separator;
+    return gsdl3_path + "sites" + File.separator;
 
     }