Changeset 4540

Timestamp:

2003-06-10T15:32:55+12:00 (21 years ago)

Author:

kjdon

Message:

have changed teh way indexes are written to and read from the config file: greenstone extracted metadata has the ex namespace internally in the gatherer, but not in the index specifications in the config file.

Location:

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

Files:

• CollectionMeta.java (modified) (1 diff)
• CollectionMetaManager.java (modified) (1 diff)
• Index.java (modified) (5 diffs)
• IndexManager.java (modified) (4 diffs)

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

@@ -143 +143 @@
         text = text + ".";
         Index index = (Index)name;
-        text = text + index.toString(false) + " ";
+        text = text + index.toStringConfig() + " ";
     }
     else if(name instanceof SubIndex) {

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

@@ -221 +221 @@
             ///ystem.err.println("Detected '.' prefix.");
             String key_str = (String)key;
+            key = null;
             key_str = key_str.substring(1);
-            key = manager.indexes.getIndex(key_str);
+            Index ind = Index.parseIndexConfig(key_str, manager);
+            if (ind != null) {
+                
+                key = manager.indexes.getIndex(ind.toString(false));
+            }
+            
             // If that didn't work, then it might be a subindex so have a bash at retrieving that instead.
             if(key == null) {

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

@@ -52 +52 @@
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.StringTokenizer;
 import java.util.Vector;
 import org.greenstone.gatherer.cdm.CollectionMeta;
 import org.greenstone.gatherer.msm.MSMUtils;
+import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.Element;
 /** This class encapsulates a single indexing pair.
@@ -76 +78 @@
     /** An values of items in the index level enumeration. */
     static public final String LEVEL[] = {"document","paragraph","section"};
+
     /** Constructor.
      * @param level The level of this index as a <strong>String</string>.
@@ -121 +124 @@
     return result;
     }
+    /** Method to get the data source of this index.
+     * @return A <strong>String</string> which is a comma separated list of either fully qualified names of an assigned metadata elements, or "text".
+     * Note, greenstone extracted metadata do not have the ex. 
+     */
+    public String getDataConfig() {
+    String result = "";
+    Collections.sort(sources, new IndexComparator());
+    for(int i = 0; i < sources.size(); i++) {
+        String source = sources.get(i).toString();
+        if (source.startsWith("ex.")) {
+        // remove the ex. bit
+        source = source.substring(3);
+        }
+        result = result + source;
+        if(i < sources.size() - 1) {
+        result = result + ",";
+        }
+    }
+    return result;
+    }
+    
     /** Method to get the value of level.
       * @return The value of level as a <strong>String</strong>.
@@ -146 +170 @@
     }
     return "";
+    
     }
     /** Method to turn this object into a string representation ready to be placed in the collection configuration file.
@@ -162 +187 @@
     return LEVEL[level] + ":" + getData();
     }
+    
+    /** Retrieve a textual representation of this index, specifically for the configuration files. Extracted metadata is shown to teh user and stored as ex.MD, however in the config file it should have no namespace */
+    public String toStringConfig() {
+
+    return LEVEL[level] + ":" + getDataConfig();
+    }
+
+    /** Method to parse a configuration file index specification into an Index
+     * object. returns null if invalid syntax */
+    public static Index parseIndexConfig(String entry, CollectionDesignManager manager) {
+    // all (mg) indexes must start with level:
+    if(entry.indexOf(":") == -1) {
+        return null;
+    }
+    
+    String level_str = entry.substring(0, entry.indexOf(":"));
+    String sources_raw = entry.substring(entry.indexOf(":") + 1);
+    Vector sources = new Vector();
+    StringTokenizer st = new StringTokenizer(sources_raw, ",");
+    while(st.hasMoreTokens()) {
+        String token = st.nextToken();
+        // We may have to replace old : with whatever namespace separator we are using.
+        token = token.replace(':', MSMUtils.NS_SEP);
+        // if there is no namespace, we need to add one, except for text
+        if (token.indexOf(MSMUtils.NS_SEP)==-1) {
+        if (!token.equals("text")) {
+            token = Utility.EXTRACTED_METADATA_NAMESPACE+MSMUtils.NS_SEP+token;
+        }
+        }
+        
+        sources.add(token);
+    }
+    Index index = null;
+    for(int i = 0; i < Index.LEVEL.length; i++) {
+        if(level_str.equals(Index.LEVEL[i])) {
+        return new Index(i, sources, manager);
+        
+        }
+    }
+    // somethings gone wrong
+    return null;
+    
+    }
+    
     /** A custom comparator for comparing Indexes. */
     private class IndexComparator

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

@@ -217 +217 @@
         while(ct.hasMoreTokens()) {
         String entry = ct.nextToken();
-        if(entry.indexOf(":") != -1) {
-            String level_str = entry.substring(0, entry.indexOf(":"));
-            String sources_raw = entry.substring(entry.indexOf(":") + 1);
-            Vector sources = new Vector();
-            StringTokenizer st = new StringTokenizer(sources_raw, ",");
-            while(st.hasMoreTokens()) {
-            String token = st.nextToken();
-            // We may have to replace old : with whatever namespace separator we are using.
-            token = token.replace(':', MSMUtils.NS_SEP);
-            sources.add(token);
-            }
-            for(int i = 0; i < Index.LEVEL.length; i++) {
-            if(level_str.equals(Index.LEVEL[i])) {
-                addIndex(new Index(i, sources, manager));
-            }
-            }
-        }
-        else {
+        Index index = Index.parseIndexConfig(entry, manager);
+        if (index != null) {
+            addIndex(index);
+            
+        } else { // return false if there is one error??
             return false;
         }
         }
+        
         return true;
     }
@@ -244 +232 @@
         ct.nextToken();
         String entry = ct.nextToken();
-        if(entry.indexOf(":") != -1) {
-        String level_str = entry.substring(0, entry.indexOf(":"));
-        String sources_raw = entry.substring(entry.indexOf(":") + 1);
-        Vector sources = new Vector();
-        StringTokenizer st = new StringTokenizer(sources_raw, ",");
-        while(st.hasMoreTokens()) {
-            sources.add(st.nextToken());
-        }
-        for(int i = 0; i < Index.LEVEL.length; i++) {
-            if(level_str.equals(Index.LEVEL[i])) {
-            setDefault(new Index(i, sources, manager));
-            }
-        }
-        }
-        else {
-        return false;
-        }
-        return true;
-    }
+        Index index = Index.parseIndexConfig(entry, manager);
+        if (index != null) {
+        setDefault(index);
+        return true;
+        } 
+        return false;
+    }
+    
     return false;
     }
@@ -316 +293 @@
         for(int i = 0; i < size(); i++) {
         Index index = (Index) get(i);
-        text = text + index.toString(false);
+        text = text + index.toStringConfig();
         if(i < size() - 1) {
             text = text + " ";
         }
         }
-                // Now the default index if there is one, or just the first index
-                // if there isn't
+        // Now the default index if there is one, or just the first index
+        // if there isn't
         if(default_index != null) {
-        text = text + "\ndefaultindex " + default_index.toString(false) + "\n";
+        text = text + "\ndefaultindex " + default_index.toStringConfig() + "\n";
         }
         text = text + "\n";
@@ -330 +307 @@
     return text;
     }
+
+
+
+
+    
     /** Overloaded to call get with both a key and an empty argument array.
       * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.