Changeset 7739 for trunk/gli/src/org/greenstone/gatherer/cdm

Timestamp:

2004-07-16T13:48:18+12:00 (20 years ago)

Author:

davidb

Message:

General restructuring to allow GLI to be run as an applet.
Main area of change: making code look in the JAR file first
for a file rather than assume on local file system.
Stores data locally on system in '.gli' or Greenstone/GLI
folder in users home space for subsequent uses of applet.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java (modified) (3 diffs)

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

@@ -44 +44 @@
 import org.greenstone.gatherer.cdm.TranslationView;
 import org.greenstone.gatherer.util.GSDLSiteConfig;
+import org.greenstone.gatherer.util.Utility;
 
 /** This manager provides access to submanagers, which in turn provide tools for the designing of Greenstone collections via the information stored in etc/collect.cfg. This class acts as a hub for the managers that handle specific parts of the configuration such as classifiers, format strings and language settings.
@@ -211 +212 @@
       ///ystem.err.println("Would have released collection if necessary.");
       boolean collection_released = false;
-      if(format_manager.formatsChanged() && Gatherer.c_man.built() && Gatherer.config.exec_file != null) {
+      String col_name = Gatherer.c_man.getCollection().getName();
+      boolean formats_changed = format_manager.formatsChanged();
+
+      if(formats_changed && Gatherer.c_man.built() && Gatherer.config.exec_file != null) {
       // Release the collection
-      Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + Gatherer.c_man.getCollection().getName());
+      Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + col_name);
       // This is very important -- it ensures that the above command has finished
       Gatherer.self.configServer("");
@@ -222 +226 @@
       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);
+          Utility.upload_url_zip(col_name,"etc");
+      }
+      }
+
       // Readd collection
       ///ystem.err.println("Would have added collection if it had been released.");
       if(collection_released) {
-      // Then re-add it to force format commands to be processed
-      Gatherer.self.configServer(GSDLSiteConfig.ADD_COMMAND + Gatherer.c_man.getCollection().getName());
+      // 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("");
-     // Unset formats changed
-     format_manager.setFormatsChanged(false);
-      }
-    }
+      }
+
+      if (formats_changed) {
+      // Unset formats changed
+      format_manager.setFormatsChanged(false);
+      }
+   }
 
 //     /** Ensures that the collection is now public. Useful for collections that are based on another, or that are about to be exported */