Changeset 21605 for main/trunk/greenstone2/runtime-src/src

Timestamp:

2010-01-25T15:03:40+13:00 (14 years ago)

Author:

mdewsnip

Message:

Swapped an "if" block and an "else" block in metaformat::scan_metadata() so the oaimapping (specified in the oai.cfg file) is used in preference to the automatic code that looks at a value like "dc.Provenance" and maps it automatically to oai_dc.provenance. This means the user always has full control if they want it, instead of being unable to override the automatic mapping if they need to.

File:

• main/trunk/greenstone2/runtime-src/src/oaiservr/metaformat.cpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/oaiservr/metaformat.cpp

@@ -67 +67 @@
     }
 
-    if (metaItem == this->formatPrefix()) {
+    // Map the element using the "oaimapping" specification from the oai.cfg/collect.cfg files, if defined
+    text_t mapTo = this->get_mapping(collection, here->first);
+    if (mapTo != "") {
+      // Do we actually want to do anything here? Doesn't getting here imply that this 
+      // particular metadata is stuff we don't want?
+      if (doOutput) {
+    if (this->is_valid_element(mapTo)) {
+      this->output_item(output, utf8convert, headerDone, mapTo, here->second.values);
+    }
+      }
+      else {
+    if (here->second.values.size() > 0) {
+      return true;
+    }
+      }
+    }
+
+    // Otherwise try to map the element automatically
+    // For example, dc.X is mapped to oai_dc.X (doesn't check X is a valid Dublin Core element though)
+    else if (metaItem == this->formatPrefix()) {
       metaItem = substr(last+1, here->first.end()); // Get the rest of the metadata tag (it's name) but without the '.'
       // remove xxx^ eg Coverage^Spatial becomes spatial
@@ -90 +109 @@
     }  
     else {
-      text_t mapTo = this->get_mapping(collection, here->first);
-      if (mapTo != "") {
-    // Do we actually want to do anything here? Doesn't getting here imply that this 
-    // particular metadata is stuff we don't want?
-    if (doOutput) {
-      if (this->is_valid_element(mapTo)) {
-        this->output_item(output, utf8convert, headerDone, mapTo, here->second.values);
-      }
-    }
-    else {
-      if (here->second.values.size() > 0) {
-        return true;
-      }
-    }
-      }
     }