Changeset 4336

Timestamp:

2003-05-26T16:26:49+12:00 (21 years ago)

Author:

jmt12

Message:

when using a base collection dumps collection icon, and has special case for custom AZList in dls - John

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (15 diffs)

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

@@ -88 +88 @@
      /** The collection this manager is managing! */
      private Collection collection = null;
+     /** The collection_model. */
+     private FileSystemModel collection_model = null;
+     /** The workspace model. This becomes invalid on a collection change. */
+     private FileSystemModel workspace_model = null;
      /** An inner class listener responsible for noting tree changes and resetting saved when they occur. */
      private FMTreeModelListener fm_tree_model_listener = null;
@@ -96 +100 @@
      /** The monitor resposible for parsing the import process. */
      private GShellProgressMonitor import_monitor = null;
-     /** The collection_model. */
-     private FileSystemModel collection_model = null;
-     /** The workspace model. This becomes invalid on a collection change. */
-     private FileSystemModel workspace_model = null;
+
+     private int special_case = -1;
      /** The name of the standard lock file. */
      static final public String LOCK_FILE = "gatherer.lck";
+     static final public int NO_SPECIAL_CASE = -1;
+     static final public int SPECIAL_DLS = 0;
      /** Constructor. */
      public CollectionManager() {
@@ -194 +198 @@
      /** Used to set the current collection to the given collection. Note that this call should -always- be proceeded by a ready call, and if the colection is ready and the saved flag is unset then the user should be prompted to save. Also note that this method creates yet another GShell to run buildcol.pl. */
      public void createCollection(String description, String email, String name, String title, File base_collection_directory, ArrayList metadata_sets) {
+          special_case = NO_SPECIAL_CASE;
           try {
                 // Create a progress monitor.
@@ -200 +205 @@
                 makeCollection(description, email, name, title);
                 progress.setProgress(1);
- 
+
                 // ACTIVE_DIR/gimport/
                 String a_dir = Utility.getCollectionDir(Gatherer.config.gsdl_path) + name + File.separator;
-                
+
                 // Has to be done before creating greenstone directory metadata manager.
                 File gimport_dir_temp = new File(Utility.getImportDir(a_dir)+"temp.dat");
@@ -211 +216 @@
                      progress.setNote(get("Gimport_Created"));
                 }
-                
+
                 File gcache_dir_temp = new File(Utility.getCacheDir(a_dir)+"temp.dat");
                 File gcache_dir = gcache_dir_temp.getParentFile();
@@ -218 +223 @@
                      progress.setNote(get("Gcache_Created"));
                 }
-                
+
                 progress.setProgress(2);
 
@@ -244 +249 @@
                                      ///ystem.err.println("Found a metadata set. Importing: " + possible_metadata_sets[i].getAbsolutePath());
                                      collection.msm.importMDS(possible_metadata_sets[i], false);
-                                }                                   
+                                }
                           }
                      }
@@ -255 +260 @@
                           // Demo collection - part of the DLS
                           if(collection_name.equals(Utility.COLLECTION_DEMO) || collection_name.equals(Utility.COLLECTION_DLS)) {
+                                special_case = SPECIAL_DLS;
                                 String demo_directory = (new File(base_collection_directory.getParentFile(), Utility.COLLECTION_DEMO_DIRECTORY)).getAbsolutePath();
                                 String dls_directory = (new File(base_collection_directory.getParentFile(), Utility.COLLECTION_DLS_DIRECTORY)).getAbsolutePath();
@@ -317 +323 @@
                 collection.cdm = new CollectionDesignManager();
                 collection.gdm = new GDMManager();
-                
+
                 progress.setProgress(3);
 
@@ -841 +847 @@
                 installCollection();
                 collection.setBuilt(true);
-                if(Gatherer.g_man != null) {
-                     workspace_model = null;
-                     Gatherer.g_man.collectionChanged(ready());
-                }
+                // If we have a local library running (that we know about) then we ask it to add our newly create collection
+                System.err.println("Check if we should reset local server.");
+                if(Gatherer.config.exec_file != null) {
+                    System.err.println("Local Library Found!");
+                    Gatherer.g_man.preview_pane.resetServer();
+                }
+                else {
+                    System.err.println("GLI can't recognize a local library.");
+                }
+                // Signal collection changed.
+                workspace_model = null;
+                Gatherer.g_man.collectionChanged(ready());
                 JOptionPane.showMessageDialog(Gatherer.g_man, get("Preview_Ready"), get("Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
           }
@@ -1093 +1107 @@
                           }
                      }
+                     else if(command_lc.startsWith(Utility.CFG_COLLECTIONMETA_ICONCOLLECTION)) {
+                          write(out, Utility.CFG_COLLECTIONMETA_ICONCOLLECTION + " \"\"");
+                     }
+
+                     // Just before we try more general parsing there are the special cases to check. These are explicit changes required by some collections to produce sensible results.
+                     else if(special_case == SPECIAL_DLS && command_lc.equals("classify      hierarchy -hfile azlist.txt -metadata azlist -sort title -buttonname title -hlist_at_top")) {
+                          write(out, "classify AZList -metadata dls.Title -buttonname Title");
+                     }
                      else if(command_lc.startsWith(Utility.CFG_CLASSIFY)) {
                           StringTokenizer tokenizer = new StringTokenizer(command);
                           StringBuffer text = new StringBuffer(tokenizer.nextToken());
                           // Read in the classifier command watching for hfile, metadata and sort arguments.
+                          String buttonname = null;
                           String hfile = null;
-                          String metadata = null;
+                          String new_metadata = null;
+                          String old_metadata = null;
                           while(tokenizer.hasMoreTokens()) {
                                 String token = tokenizer.nextToken();
@@ -1117 +1141 @@
                                           if(replacement != null) {
                                                 token = replacement;
-                                                metadata = replacement;
+                                                old_metadata = temp_metadata;
+                                                new_metadata = replacement;
                                           }
                                           else {
@@ -1142 +1167 @@
                                      }
                                 }
+                                else if(token.equals(Utility.CFG_CLASSIFY_BUTTONNAME)) {
+                                    buttonname = token;
+                                }
                                 text.append(' ');
                                 text.append(token);
@@ -1147 +1175 @@
                           }
                           tokenizer = null;
+
+                          // If we replaced the metadata argument and didn't encounter a buttonname, then add one now pointing back to the old metadata name in order to accomodate macro files which required such names (buttonname is metadata name by default)!
+                          if(old_metadata != null && new_metadata != null && buttonname == null) {
+                            text.append(' ');
+                            text.append(Utility.CFG_CLASSIFY_BUTTONNAME);
+                            text.append(' ');
+                            text.append(old_metadata);
+                          }
                           command = text.toString();
                           // Replace the hfile if we found it
-                          if(hfile != null && metadata != null) {
-                                command = command.replaceAll(hfile, metadata + ".txt");
+                          if(hfile != null && new_metadata != null) {
+                                command = command.replaceAll(hfile, new_metadata + ".txt");
                           }
+                          buttonname = null;
                           hfile = null;
-                          metadata = null;
+                          new_metadata = null;
+                          old_metadata = null;
                           write(out, command);
                      }
@@ -1166 +1204 @@
                                      if(format_command) {
                                           target = "\\[" + target + "\\]";
-                                          replacement = "[" + replacement + "]";
+                                          replacement = "{Or}{[" + replacement + "]," + target + "}";
                                      }
-                                     command = command.replaceAll(target, replacement);
+                                     command = command.replaceAll(target, replacement);
                                 }
                           }