Changeset 8597

Timestamp:

2004-11-18T14:31:40+13:00 (19 years ago)

Author:

mdewsnip

Message:

Made Gatherer.configServer static.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (3 diffs)
• cdm/CollectionDesignManager.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (2 diffs)
• collection/DeleteCollectionPrompt.java (modified) (1 diff)

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

@@ -459 +459 @@
     // The response code is returned immediately -- but this does not mean the local
     //   library action has finished!
-    public void configServer(String command)
+    static public void configServer(String command)
     {
     try {
@@ -481 +481 @@
 
     // used to send reload coll messages to the tomcat server
-    public void configGS3Server(String site, String command) {
+    static public void configGS3Server(String site, String command) {
 
     try {
@@ -498 +498 @@
         url = null;
     }
-    catch(Exception exception) {
+    catch (Exception exception) {
         DebugStream.printStackTrace(exception);
-        ///ystem.err.println("Bad URL.");
     }
     }

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

@@ -195 +195 @@
     }
 
+
     /** Cause the current collection configuration to be written out to disk.
-     * @see org.greenstone.gatherer.cdm.ClassifierManager
-     * @see org.greenstone.gatherer.cdm.CollectionMetaManager
-     * @see org.greenstone.gatherer.cdm.FormatManager
-     * @see org.greenstone.gatherer.cdm.IndexManager
-     * @see org.greenstone.gatherer.cdm.LanguageManager
-     * @see org.greenstone.gatherer.cdm.MetadataSetView
-     * @see org.greenstone.gatherer.cdm.PlugInManager
-     * @see org.greenstone.gatherer.cdm.SubcollectionManager
-     */
-   public void save() {
-      // Release collection as necessary
-      ///ystem.err.println("Would have released collection if necessary.");
-      boolean collection_released = false;
-      String col_name = Gatherer.c_man.getCollection().getName();
-      boolean formats_changed = format_manager.formatsChanged();
-
-      if(formats_changed && Gatherer.c_man.built() && Configuration.exec_file != null) {
-      // Release the collection
-      Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + col_name);
-      // This is very important -- it ensures that the above command has finished
-      Gatherer.self.configServer("");
-      collection_released = true;
-      }
-
-      general_manager.loseFocus();
-      collect_config.save();
-
-      if (Gatherer.isGsdlRemote) {
-      if(formats_changed && Gatherer.c_man.built()) {
-          // upload etc/collect.cfg to server to reflect changes
-          Utility.zipup(col_name,Utility.CONFIG_FILE);
-          GathererApplet.upload_url_zip(col_name,"etc");
-      }
-      }
-
-      // Readd collection
-      ///ystem.err.println("Would have added collection if it had been released.");
-      if(collection_released) {
-      // Now re-add collection to server to force format commands to be processed
-      Gatherer.self.configServer(GSDLSiteConfig.ADD_COMMAND + col_name);
-      // This is very important -- it ensures that the above command has finished
-      Gatherer.self.configServer("");
-      }
-
-      if (formats_changed) {
-      // Unset formats changed
-      format_manager.setFormatsChanged(false);
-      }
-   }
+     */
+    public void save() {
+    // Release collection as necessary
+    boolean collection_released = false;
+    String col_name = Gatherer.c_man.getCollection().getName();
+    boolean formats_changed = format_manager.formatsChanged();
+
+    if (formats_changed && Gatherer.c_man.built() && Configuration.exec_file != null) {
+        // Release the collection
+        Gatherer.configServer(GSDLSiteConfig.RELEASE_COMMAND + col_name);
+        // This is very important -- it ensures that the above command has finished
+        Gatherer.configServer("");
+        collection_released = true;
+    }
+
+    general_manager.loseFocus();
+    collect_config.save();
+
+    if (Gatherer.isGsdlRemote) {
+        if (formats_changed && Gatherer.c_man.built()) {
+        // upload etc/collect.cfg to server to reflect changes
+        Utility.zipup(col_name,Utility.CONFIG_FILE);
+        GathererApplet.upload_url_zip(col_name,"etc");
+        }
+    }
+
+    // Readd collection
+    if (collection_released) {
+        // Now re-add collection to server to force format commands to be processed
+        Gatherer.configServer(GSDLSiteConfig.ADD_COMMAND + col_name);
+        // This is very important -- it ensures that the above command has finished
+        Gatherer.configServer("");
+    }
+
+    if (formats_changed) {
+        // Unset formats changed
+        format_manager.setFormatsChanged(false);
+    }
+    }
 
 

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1137 +1137 @@
         // If we have a local library running (that we know about) then we ask it to add our newly create collection
         if (Configuration.exec_file != null) {
-            Gatherer.self.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
+            Gatherer.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
             // This is very important -- it ensures that the above command has finished
-            Gatherer.self.configServer("");
+            Gatherer.configServer("");
         }
         else if (Gatherer.GS3) {
             convertToGS3Collection();
-            Gatherer.self.configGS3Server(Configuration.site_name, ServletConfiguration.ADD_COMMAND + collection.getName());
+            Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.ADD_COMMAND + collection.getName());
         }  
 
@@ -1340 +1340 @@
         // Ensure that the local library has released this collection so we can delete the index directory
         if (!Gatherer.GS3 && Configuration.exec_file != null) {
-        Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
+        Gatherer.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
 
         // This is very important -- it ensures that the above command has finished
         // This prevents the nasty "could not remove index directory" race condition!
-        Gatherer.self.configServer("");
+        Gatherer.configServer("");
         }
 

trunk/gli/src/org/greenstone/gatherer/collection/DeleteCollectionPrompt.java

@@ -310 +310 @@
         // first of all we must release it from the local library
         if (Configuration.exec_file != null) {
-        ///ystem.err.println("Local Library Found!");
-        Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getShortName());
+        Gatherer.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getShortName());
         // This is very important -- it ensures that the above command has finished
-        Gatherer.self.configServer("");
+        Gatherer.configServer("");
         }