Changeset 10237 for trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

Timestamp:

2005-07-13T11:12:11+12:00 (19 years ago)

Author:

mdewsnip

Message:

New code for "incremental" building, by Matthew Whyte.

I've only had time to look at this briefly; I've fixed a few obvious problems but I imagine this will be pretty flaky for a while.

File:

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

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

@@ -50 +50 @@
     /** This listener listens for any event on any of the components in any of the sub-views, and marks the collection as needing saving if any change occurs. */
     static public CDMChangeListener change_listener;
+    /** These listeners listen to changes in the Design mode so as to allow incremental building */
+    static public DesignChangeListener all_change_listener;
+    static public DesignChangeListener buildcol_change_listener;
+    static public DesignChangeListener collect_cfg_change_listener;
     /** A list of classifiers to use at build time. */
     static public ClassifierManager classifier_manager;
@@ -78 +82 @@
     /** The text translation manager. */
     static public TranslationView translation_view;
+    /** These mark what needs to happen when building a collection where ONLY design options have been changed.
+        The build requirements of the higher numbers must include doing everything from the lower numbers. */
+    static final public int ALL = 3;
+    static final public int BUILDCOL = 2;
+    static final public int UPDATE_COLLECT_CFG = 1;
+    static final public int NOTHING = 0;
+    static private int rebuildTypeRequired = NOTHING; //Rebuild type required if only design options have changed
+    static protected boolean update_collect_cfg_required = false;
+
     /** Constructor. Loads a certain collection configuration file, which is parsed into a DOM. This model is then registered with the command information managers, each of whom knows how to, and provides controls to, alter certain commands.
      * @param collect_config_file the File representing a collection configuration file either in its text (G2) or xml (G3) form
@@ -84 +97 @@
     DebugStream.println("Initializaing CollectionDesignModule.");
     change_listener = new CDMChangeListener();
+    all_change_listener = new DesignChangeListener(ALL);
+    buildcol_change_listener = new DesignChangeListener(BUILDCOL);
+    collect_cfg_change_listener = new DesignChangeListener(UPDATE_COLLECT_CFG);
     // Parse the collection configuration
     collect_config = new CollectionConfiguration(collect_config_file);
@@ -199 +215 @@
      */
     public void save() {
+    System.err.println("Config file saved. The level of processing needed is: " + CollectionDesignManager.getRebuildTypeRequired()); //debug
     // Release collection as necessary
     String collection_name = Gatherer.c_man.getCollection().getName();
     boolean collection_released = false;
-    boolean formats_changed = format_manager.formatsChanged();
-
-    if (formats_changed && Gatherer.c_man.built() && LocalLibraryServer.isRunning() == true) {
+
+    if (update_collect_cfg_required && Gatherer.c_man.built() && LocalLibraryServer.isRunning() == true) {
         // Release the collection
         LocalLibraryServer.releaseCollection(collection_name);
@@ -213 +229 @@
     collect_config.save();
 
-    if (Gatherer.isGsdlRemote) {
-        if (formats_changed && Gatherer.c_man.built()) {
-        // upload etc/collect.cfg to server to reflect changes
-        Utility.zipup(Gatherer.getCollectDirectoryPath(), collection_name, Utility.CONFIG_FILE, null, "", "");
-        GathererApplet.upload_url_zip(collection_name, "etc", "", null);
-        }
-    }
-
-    // Readd collection
+    if (update_collect_cfg_required && Gatherer.c_man.built() && Gatherer.isGsdlRemote) {
+        //If the GLI is running as an applet, and Format Features or Cross-Collection Searching have changed,
+        //upload etc/collect.cfg to the server to immediately reflect these changes.
+        Utility.zipup(Gatherer.getCollectDirectoryPath(), collection_name, Utility.CONFIG_FILE, null, "", "");
+        GathererApplet.upload_url_zip(collection_name, "etc", "", null);
+    }
+    
+    // Read collection
     if (collection_released) {
         // Now re-add collection to server to force format commands to be processed
@@ -227 +242 @@
     }
 
-    if (formats_changed) {
+    if (update_collect_cfg_required) {
         // Unset formats changed
-        format_manager.setFormatsChanged(false);
+        update_collect_cfg_required = false;
     }
     }
@@ -263 +278 @@
     }
 
-
+    public static int getRebuildTypeRequired() {
+    return rebuildTypeRequired;
+    }
+    public static void resetRebuildTypeRequired() {
+    setRebuildTypeRequired(NOTHING);
+    }
+    public static void setRebuildTypeRequired(int number) {
+    rebuildTypeRequired = number;
+    }
+
+    /**
+     * What exactly does this do?
+     */
     private class CDMChangeListener
     implements ActionListener, DocumentListener {
 
+    /** Gives notification that an event has happened */
     public void actionPerformed(ActionEvent event) {
         Gatherer.c_man.getCollection().setSaved(false);