Changeset 4512

Timestamp:

2003-06-09T11:48:54+12:00 (21 years ago)

Author:

jmt12

Message:

2030108: Fixed collectionmeta disappearing.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• CollectionMetaManager.java (modified) (1 diff)
• SubcollectionManager.java (modified) (1 diff)

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

@@ -217 +217 @@
             value = ct.nextToken();
             }
-            // Check if the key is an index, an if so retrieve it.
+            // Check if the key is an index, and if so retrieve it.
             if(((String)key).startsWith(".")) {
+            ///ystem.err.println("Detected '.' prefix.");
             String key_str = (String)key;
             key_str = key_str.substring(1);
             key = manager.indexes.getIndex(key_str);
+            // If that didn't work, then it might be a subindex so have a bash at retrieving that instead.
+            if(key == null) {
+                key = manager.subcollections.getSubIndex(key_str);
+                //if(key != null) {
+                ///ystem.err.println("Its a subindex.");
+                //}
+                //else {
+                ///ystem.err.println("Error Will Robinson.");
+                //}
+            }
+            //else {
+                ///ystem.err.println("Its an index.");
+            //}
             }
             // An if we have a language code, retrieve its object too.

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

@@ -169 +169 @@
     return (Subcollection) subcollections.get(name);
     }
+
+    /** Retrieve a certain subindex given its name.
+     * @param name the String representation of a subindex.
+     * @return the SubIndex requested or null if no such subindex.
+     */
+    public SubIndex getSubIndex(String name) {
+    for(int i = 0; i < subindexes.size(); i++) {
+        SubIndex subindex = (SubIndex) subindexes.get(i);
+        if(subindex.toString().equals(name)) {
+        return subindex;
+        }
+    }
+    return null;
+    }
+
     /** Method to get all of the subindexes set.
       * @return A <strong>SubIndexes</strong> object containing all the defined indexes.