Changeset 7014

Timestamp:

2004-03-11T11:03:28+13:00 (20 years ago)

Author:

mdewsnip

Message:

Taken out anything collection specific. This is bad.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (6 diffs)
• gui/NewCollectionDetailsPrompt.java (modified) (1 diff)
• util/Utility.java (modified) (2 diffs)

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

@@ -112 +112 @@
     private GShellProgressMonitor import_monitor = null;
 
-    private int special_case = -1;
     /** Holds a reference to the thread responsible for closing the collection. If non-null then only calls from the given thread will see the collection is non-ready. All other threads will have to wait until closing thread, and all of it consequential calls, are completely finished. */
     private Thread closing_thread = null;
@@ -118 +117 @@
     /** The name of the standard lock file. */
     static final public String LOCK_FILE = "gli.lck";
-    static final public int NO_SPECIAL_CASE = -1;
-    static final public int SPECIAL_DLS = 0;
 
     /** Used to indicate the source of the message is the file collection methods. */
@@ -248 +245 @@
     public void createCollection(String description, String email, String name, String title, File base_collection_directory, ArrayList metadata_sets) {
     boolean cancelled = false;
-    special_case = NO_SPECIAL_CASE;
+
     try {
         // Create a progress monitor.
@@ -303 +300 @@
             Gatherer.println("This base collection has no metadata directory.");
         }
-        // If no sets were imported, then create a new metadata with this new collections name. Note that if this is one of the 'big five' collections then I already know the importing mappings as well.
+        // If no sets were imported, then create a new metadata with this new collections name.
         if(collection.msm.getSets().size() == 0) {
-            Gatherer.println("As there are no metadata sets loaded yet, we'll make special checks for the collections available on the GS2.39CD.");
-            BasicCollectionConfiguration col_con = new BasicCollectionConfiguration(new File(base_collection_directory, Utility.CONFIG_DIR));
-            // If the source collection is one of the 'big five' then we know what the metadata set is.
-            String collection_name = col_con.getName();
-            // Demo collection - part of the DLS
-            if(collection_name.equals(Utility.COLLECTION_DEMO) || collection_name.equals(Utility.COLLECTION_DLS)) {
-            Gatherer.println("+ This is a DLS.mds collection.");
-            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();
-            // Add the dls.mds
-            collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.DLS_MDS), false);
-            // Add the mappings for the dls (even if its not present).
-            collection.msm.profiler.addAction(dls_directory, "AZList", "dls.AZList");
-            collection.msm.profiler.addAction(dls_directory, "Keyword", "dls.Keyword");
-            collection.msm.profiler.addAction(dls_directory, "Language", "dls.Language");
-            collection.msm.profiler.addAction(dls_directory, "Organization", "dls.Organization");
-            collection.msm.profiler.addAction(dls_directory, "Subject", "dls.Subject");
-            collection.msm.profiler.addAction(dls_directory, "Title", "dls.Title");
-            // Add the mappings for the demo dls (even if its not present).
-            collection.msm.profiler.addAction(demo_directory, "AZList", "dls.AZList");
-            collection.msm.profiler.addAction(demo_directory, "Keyword", "dls.Keyword");
-            collection.msm.profiler.addAction(demo_directory, "Language", "dls.Language");
-            collection.msm.profiler.addAction(demo_directory, "Organization", "dls.Organization");
-            collection.msm.profiler.addAction(demo_directory, "Subject", "dls.Subject");
-            collection.msm.profiler.addAction(demo_directory, "Title", "dls.Title");
-            // Skip the import phase
-            skip_import_phase = true;
+            // Prompt the user so that they can choose at least one initial metadata set. We're sneaky here and just create a ncm_prompt
+            Gatherer.println("This collection has no metadata sets. Present the user with the metadata set selection prompt.");
+            NewCollectionMetadataPrompt ncm_prompt = new NewCollectionMetadataPrompt();
+            // If cancelled then they really do mean to start a collection with no metadata sets.
+            if(!ncm_prompt.isCancelled()) {
+            ArrayList initial_sets = ncm_prompt.getSets();
+            for(int i = 0; initial_sets != null && i < initial_sets.size(); i++) {
+                MetadataSet metadata_set = (MetadataSet) initial_sets.get(i);
+                collection.msm.importMDS(metadata_set.getFile(), false);
+                metadata_set = null;
+            }
+            initial_sets = null;
             }
-            // Prompt the user so that they can choose at least one initial metadata set. We're sneaky here and just create a ncm_prompt
-            else {
-            Gatherer.println("This collection has no metadata sets, nor is it one of our special collections, thus we cannot import any metadata sets automatically. Present the user with the metadata set selection prompt.");
-            NewCollectionMetadataPrompt ncm_prompt = new NewCollectionMetadataPrompt();
-            // If cancelled then they really do mean to start a collection with no metadata sets.
-            if(!ncm_prompt.isCancelled()) {
-                ArrayList initial_sets = ncm_prompt.getSets();
-                for(int i = 0; initial_sets != null && i < initial_sets.size(); i++) {
-                MetadataSet metadata_set = (MetadataSet) initial_sets.get(i);
-                collection.msm.importMDS(metadata_set.getFile(), false);
-                metadata_set = null;
-                }
-                initial_sets = null;
-            }
-            ncm_prompt.dispose();
-            ncm_prompt = null;
-            }
+            ncm_prompt.dispose();
+            ncm_prompt = null;
         }
         // Do a dry metadata import run over the entire base collection, recording profile mappings. We do this by finding the archive files, and then iterating over them using the GreenstoneArchiveParser to retrieve metadata from them. We then process the importing of new metadata elements using the selectElement prompt used in a file action metadata import. However the big change is that we don't actually import any metadata, just create importing profiles.
@@ -1375 +1341 @@
         // Now read in base_cfg line by line, parsing important onces and/or replacing them with information pertinent to our collection. Each line is then written back out to the new collect.cfg file.
         try {
-            BufferedReader in = new BufferedReader(new FileReader(base_cfg));
-            BufferedWriter out = new BufferedWriter(new FileWriter(new_cfg, false)); // Overwrite whats there.
-            String command = null;
-            while((command = in.readLine()) != null) {
+            BufferedReader in = new BufferedReader(new FileReader(base_cfg));
+            BufferedWriter out = new BufferedWriter(new FileWriter(new_cfg, false)); // Overwrite whats there.
+            String command = null;
+            while((command = in.readLine()) != null) {
             // We have to test the end of command for the special character '\'. If found, remove it and append the next line, then repeat.
             while(command.trim().endsWith("\\")) {
-                command = command.substring(0, command.lastIndexOf("\\"));
-                String next_line = in.readLine();
-                if(next_line != null) {
-                    command = command + next_line;
-                }
+                command = command.substring(0, command.lastIndexOf("\\"));
+                String next_line = in.readLine();
+                if(next_line != null) {
+                command = command + next_line;
+                }
             }
             ///ystem.err.println("Read: " + command);
@@ -1416 +1382 @@
             }
             */
-        // 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.
-            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)) {
+            // 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.
+            if(command_lc.startsWith(Utility.CFG_CLASSIFY)) {
             StringTokenizer tokenizer = new StringTokenizer(command);
             StringBuffer text = new StringBuffer(tokenizer.nextToken());

trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

@@ -102 +102 @@
     Dictionary.setText(this, "NewCollectionPrompt.Title");
 
-    // Model building. Build a model of all of the collections in the gsdl collect directory with the appropriate directories and hardcode the big five.
+    // Model building. Build a model of all of the collections in the gsdl collect directory with the appropriate directories.
     Vector base_collection_model = new Vector();
-    // Dummy item
     File gsdl_collection_directory = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
     File[] possible_collections = gsdl_collection_directory.listFiles();
-    for(int i = 0; possible_collections != null && i < possible_collections.length; i++) {
-        // The simpliest case is if the directory etc/collect.cfg file and a metadata/ in it. Thus it can easily be built upon.
+    for (int i = 0; possible_collections != null && i < possible_collections.length; i++) {
+        // If the directory has a etc/collect.cfg file then it looks like a collection
         File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_DIR);
-        File metadata_directory = new File(possible_collections[i], Utility.META_DIR);
-        if(collect_cfg_file.exists()) {
-        BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);
-        String collection_name = collect_cfg.getName();
-        // Even if there is no metadata directory we add it if its one of the 'big five + 1' that we know how to handle.
-        if(metadata_directory.exists() || collection_name.equals(Utility.COLLECTION_DLS) || collection_name.equals(Utility.COLLECTION_DEMO)) {
-            // Add to model.
+        if (collect_cfg_file.exists()) {
+        // If the directory has a metadata/ then the collection can be used as a base
+        File metadata_directory = new File(possible_collections[i], Utility.META_DIR);
+        if (metadata_directory.exists()) {
+            // Add to model
+            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);
             Item item = new Item(possible_collections[i], collect_cfg);
-            if(!base_collection_model.contains(item)) {
+            if (!base_collection_model.contains(item)) {
             base_collection_model.add(item);
             }
         }
-        collection_name = null;
-        collect_cfg = null;
-        // Else not a collection we know how to retrieve the metadata set for.
-        }
-        // Else not a collection at all. Someones pulling a fast one.
+        }
     }
 

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

@@ -87 +87 @@
     /** Definition of an important directory name, in this case the parent directory of all the collections in the gsdl. */
     static final public String COL_DIR = "collect" + File.separator;
-    static final public String COLLECTION_DEMO = "greenstone demo";
-    static final public String COLLECTION_DEMO_DIRECTORY = "demo" + File.separator;
-    static final public String COLLECTION_DLS = "Development Library Subset";
-    static final public String COLLECTION_DLS_DIRECTORY = "dls" + File.separator;
     static final public String COLLECTION_TREE = "Collection";
     /** Definition of an important directory name, in this case the file the collection configuration is expect to be in. */
@@ -101 +97 @@
     /** The default dictionary to load. */
     static final public String DICTIONARY = "dictionary";
-    static final public String DLS_MDS = "dls.mds";
     static final public String ENCODING = "UTF-8";
     static final public String ENGLISH_VALUE = "en";