Changeset 5712

Timestamp:

2003-10-23T10:48:34+13:00 (21 years ago)

Author:

jmt12

Message:

Now metadata attached to files whose origin is the base collection, can be automatically assumed to be extracted if no other namespace is specified

File:

• trunk/gli/src/org/greenstone/gatherer/msm/parsers/GreenstoneMetadataParser.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/parsers/GreenstoneMetadataParser.java

@@ -93 +93 @@
     /** Locate and import any metadata parsed by this metadata parser given the file involved and its previous incarnation. */
     public boolean process(FileNode destination, FileNode origin, boolean folder_level, boolean dummy_run) {
-    ///atherer.println("GreenstoneMetadataParser: Process " + origin + ": ");
+    Gatherer.println("GreenstoneMetadataParser: Process " + origin + ": ");
     int counter = 0;
     dialog_cancelled = false;
@@ -114 +114 @@
         if(possible_cfg_file.exists() && (possible_gimport_directory.exists() || possible_import_directory.exists())) {
         found = true;
-        ///ystem.err.println("Found greenstone collection at " + collection_dir.getAbsolutePath());
+        Gatherer.println("Found greenstone collection at " + collection_dir.getAbsolutePath());
         }
         else {
@@ -131 +131 @@
 
     // 2. If a collection configuration file was found, attempt to merge in any mdses and make note of those that are successfully imported (by removing reference from collect.cfg).
-    ///ystem.err.print("2 ");
+    Gatherer.println("Merging in any metadata sets found.");
     if(collect_cfg != null) {
         ArrayList mdses = collect_cfg.getMetadataSets();
@@ -143 +143 @@
 
     // 3. Locate all of the metadata.xml files that may have an affect on the origin file. Make sure the metadata.xml closest to the origin files directory is last (to ensure property inheritance regarding accumulate/overwrite).
-    ///ystem.err.print("3 ");
+    Gatherer.println("Searching for metadata.xml files");
     ArrayList search_files = new ArrayList();
     File file = origin.getFile();
@@ -176 +176 @@
     for(int i = 0; i < search_files.size(); i++) {
         MetadataXMLFileSearch a_search = (MetadataXMLFileSearch) search_files.get(i);
-        ///ystem.err.println("Search " + a_search.file.getAbsolutePath() + " for " + (a_search.filename != null ? a_search.filename : ".*"));
+        Gatherer.println("Search " + a_search.file.getAbsolutePath() + " for " + (a_search.filename != null ? a_search.filename : ".*"));
+        Gatherer.println("Search at the " + (folder_level ? "Folder" : "Filename") + " level");
         // Retrieve the document
         BasicGDMDocument document = getDocument(a_search.file);
@@ -193 +194 @@
     search_files = null;
     // Finally assign the metadata
-    ///ystem.err.println("Found " + metadata.size() + " pieces of metadata for " + destination);
+    Gatherer.println("Found " + metadata.size() + " pieces of metadata for " + destination);
     if(metadata.size() > 0) {
         addMetadata(origin, destination, metadata, collection_dir, collect_cfg, dummy_run);
@@ -281 +282 @@
         ///atherer.println("Assigning metadatum.");
         if(metadatum != null) {
-            // 6c. Try to add metadata. If there is no matching metadata element:
-            ElementWrapper element = Gatherer.c_man.getCollection().msm.getElement(metadatum.element, true);
-            // Arg. The element returned may come from the Greenstone dls, which of course should never be involved during importing. To solve check the namespace isn't "" and if it is nullify the element. Nullify. NULLIFY, Bwuhahahaha...
-            if(element != null && element.getNamespace().equals("")) {
-            element = null;
-            }
+           ElementWrapper element = null;
+           // 6c. Try to add metadata.
+           // If we just happen to be importing files from our base collection, then we can assume that any non-namespaced elements are actually extracted metadata
+           if(Utility.isParentFolderOf(Gatherer.c_man.getCollection().getBaseCollection(), origin.getFile().getParentFile())) {
+              element = Gatherer.c_man.getCollection().msm.getElement(metadatum.element);// Perfect Match not required
+           }
+           // Typical case
+           else {
+              element = Gatherer.c_man.getCollection().msm.getElement(metadatum.element, true); // Perfect match
+           }
+           
+           ///ystem.err.println("Closest match: " + element);
             // 6ci. If no match exists, prompt the user to add/merge with specific metadata element. The user can also choose to ignore this metadata.
             if(element == null) {