Changeset 16267

Timestamp:

2008-07-02T09:04:06+12:00 (15 years ago)

Author:

davidb

Message:

Support for 'collectgroup' added, whereby Greenstone 2 collections can be grouped into different sets of collections. Thought I had all the angles covered but it turns out I've overlooked the case of 'base this on' collection feature of GLI, which currently doesn't know about the collectgroup feature. Committing what I have for now, as since there are no instructions on how to use this feature, no one is going to activating it

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• collection/BasicCollectionConfiguration.java (modified) (3 diffs)
• collection/ScriptOptions.java (modified) (1 diff)
• gui/OpenCollectionDialog.java (modified) (3 diffs)
• util/StaticStrings.java (modified) (1 diff)

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

@@ -56 +56 @@
     private String name = "";
     private String is_public = "";
+    private String collectgroup = "false";
     
     private String site = null; // used for gs3 colls
@@ -95 +96 @@
             else if(command_type_str.equals(StaticStrings.COLLECTIONMETADATA_MAINTAINER_STR)) {
                 maintainer = tokenizer.nextToken();
+            }
+            else if(command_type_str.equals(StaticStrings.COLLECTIONMETADATA_COLLECTGROUP_STR)) {
+                collectgroup = tokenizer.nextToken();
             }
             else if(command_type_str.equalsIgnoreCase(StaticStrings.COLLECTIONMETADATA_STR)) {
@@ -228 +232 @@
     return is_public;
     }
+
+    public String getCollectGroup() {
+    return collectgroup;
+    }
     
     /** Retrieve the short name for this collection which, given this current file is in <col_name>/etc/collect.cfg, is the name of this file's parent file's parent.

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

@@ -252 +252 @@
         Process process = runtime.exec(args);
 
-        /*
+        
         for (int i=0; i<args.length; i++) { 
             System.err.print(args[i] + " ");
         }
         System.err.println("");
-        */
+        
 
 

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

@@ -253 +253 @@
         return;
         }
+
+        load_collection_configs(data,collect_directory);
+
+    }
+
+
+    protected void load_collection_configs(TreeSet data, File collect_directory) {
+
         File[] collection_folders = collect_directory.listFiles();
+
         for(int i = 0; i < collection_folders.length; i++) {
         File collection_folder = collection_folders[i];
         String collection_foldername = collection_folder.getName();
+
         if(collection_folder.isDirectory() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) {
             // this 'file_name' has already been prefixed by 'etc'
@@ -267 +277 @@
             }
             
-            //String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
             File config_file = new File(collection_folder, file_name);
             File collection_metadata_directory = new File(collection_folder, "metadata");
             if (collection_metadata_directory.exists() && config_file.exists()) {
             BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file);
-            data.add(collection_configuration);
+
+            // look to see if group set?
+            // => if it is, don't add, but recurse to look for child collections in collect-group
+
+            if (collection_configuration.getCollectGroup().equals("true")) {
+                load_collection_configs(data, collection_folder);
+            }
+            else {
+                data.add(collection_configuration);
+            }
             }
             config_file = null;
@@ -282 +300 @@
         collect_directory = null;
     }
+
+
 
     public Object getElementAt(int index) {

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

@@ -73 +73 @@
     static final public String COLLECTIONMETADATA_PUBLIC_ELEMENT = "Public";
     static final public String COLLECTIONMETADATA_PUBLIC_STR = "public";
+    static final public String COLLECTIONMETADATA_COLLECTGROUP_STR = "collectgroup";
     static final public String COLLECTIONMETADATA_STR = "collectionmeta";
     static final public String COLON_CHARACTER = ":";