Changeset 5039

Timestamp:

2003-07-25T16:38:55+12:00 (21 years ago)

Author:

jmt12

Message:

Fixed bug where no metadata was being extracted from the archives unless it was already specified in the extracted metadata set. (a test during inserting a new element was comparing to 'ex' and was, not surprisingly, failing).

Location:

trunk/gli/src/org/greenstone/gatherer/msm

Files:

• GreenstoneArchiveParser.java (modified) (4 diffs)
• MetadataSetManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java

@@ -39 +39 @@
 import java.net.*;
 import java.util.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Collection;
@@ -62 +63 @@
     public GreenstoneArchiveParser(GShellProgressMonitor progress, GShell shell) {
     // We can only extract metadata if an extracted metadata set exists in our collection.
-    if(Gatherer.c_man.msm.getSet("") != null) {
+    if(Gatherer.c_man.msm.getSet(Utility.EXTRACTED_METADATA_NAMESPACE) != null) {
         this.shell = shell;
         // Determine the collection archive directory.
@@ -74 +75 @@
             // Then extract the metadata from it.
             if(document_file.exists()) {
-            extractMetadata(document_file);
+            int count = extractMetadata(document_file);
             // Display a pretty progress message.
-            shell.fireMessage(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Gatherer.dictionary.get("GShell.Extracted", document_directories[i].getName()), GShell.OK);
+            String[] args = new String[2];
+            args[0] = document_directories[i].getName();
+            args[1] = String.valueOf(count);
+            shell.message(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Gatherer.dictionary.get("GShell.Extracted", args), GShell.OK);
+            args = null;
             progress.increment();
             }
@@ -115 +120 @@
                 ElementWrapper element = Gatherer.c_man.msm.getElement(name);
                 if(element == null) {
-                MetadataSet extracted_mds = Gatherer.c_man.msm.getSet("ex");
+                MetadataSet extracted_mds = Gatherer.c_man.msm.getSet(Utility.EXTRACTED_METADATA_NAMESPACE);
                 if(extracted_mds != null) {
-                    element = extracted_mds.addElement(name);
+                    element = extracted_mds.addElement(name, Gatherer.config.interface_language);
                 }
                 }

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java

@@ -386 +386 @@
     // First we seperate off what set it is in, where we have '<set><namespace_separator><element>'.
     if(name.indexOf(MSMUtils.NS_SEP) != -1) {
-        String namespace = name.substring(0, name.indexOf(MSMUtils.NS_SEP));
-                // Retrieve the correct set if possible.
-        set = (MetadataSet)mds_hashtable.get(namespace);
-        namespace = null;
-                // Now retrieve the element name.
-        element = name.substring(name.indexOf(MSMUtils.NS_SEP) + 1);
+        if(name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
+        // Retrieve the correct set if possible.
+        set = (MetadataSet)mds_hashtable.get("");
+        // Now retrieve the element name.
+        element = name.substring(name.indexOf(MSMUtils.NS_SEP) + 1);
+        }
+        else {
+        String namespace = name.substring(0, name.indexOf(MSMUtils.NS_SEP));
+        // Retrieve the correct set if possible.
+        set = (MetadataSet)mds_hashtable.get(namespace);
+        namespace = null;
+        // Now retrieve the element name.
+        element = name.substring(name.indexOf(MSMUtils.NS_SEP) + 1);
+        }
     }
     else {
-                // No namespace so assume ns = "".
+        // No namespace so assume ns = "".
         set = (MetadataSet)mds_hashtable.get("");
         element = name;
     }
     if(set != null) {
-                ///ystem.err.print("Trying to match element " + element +"?");
+        ///ystem.err.print("Trying to match element " + element +"?");
         Element temp = set.getElement(element);
         if(temp != null) {
@@ -457 +465 @@
         return (MetadataSet) mds_hashtable.get(name);
     }
+    else if(name.equals(Utility.EXTRACTED_METADATA_NAMESPACE)) {
+        return (MetadataSet) mds_hashtable.get("");
+    }
     else {
-                ///ystem.err.println("Couldn't find metadata set.");
+        ///ystem.err.println("Couldn't find metadata set.");
         if(name.equals(HIDDEN)) {
         return createHidden();