Changeset 32203 for main/trunk

Timestamp:

2018-06-19T11:41:54+12:00 (6 years ago)

Author:

kjdon

Message:

custom code changed from outputting (for dc:identifier) gs.ResourceURL OR srclink OR link to outputting any and all that it finds of those three values.

File:

• main/trunk/greenstone2/runtime-src/src/oaiservr/dublincore.cpp (modified) (1 diff)

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

@@ -99 +99 @@
 }
 
+// output dc:identifier for gs.OAIResourceURL, srclink, and link (whichever are defined)
 bool dublin_core::output_custom_metadata(ostream &output, outconvertclass &outconvert, bool &headerDone, const text_t &collection, ResultDocInfo_t &docInfo) {
+  text_tarray values;
   text_t value = get_metadata_value(docInfo, "gs.OAIResourceURL");
-  if (value.empty()) {
-    // try srclinkFile (the metaname "srclink_file" is deprecated, use "srclinkFile")
-    value = get_metadata_value(docInfo, "srclinkFile");
-    if (value.empty()) {
-      // we have no file to link to, so link to the Greenstone version of the 
-      // document
-      value = this->oaiConfigure->getBaseLibraryURL()+"?a=d&c="+collection+"&d="+docInfo.OID;
-    } else {
-      if (starts_with(value, "[")) {
-    // its a format statement type value eg [SourceFile], need to get the appropriate metadata
-    value = substr(findchar(value.begin(), value.end(), '[')+1,findchar(value.begin(), value.end(), ']') );
-    value = get_metadata_value(docInfo, value);
+  if (!value.empty()) {
+    values.push_back(value);
+  }
+  // try srclinkFile (the metaname "srclink_file" is deprecated, use "srclinkFile")
+  value = get_metadata_value(docInfo, "srclinkFile");
+  if (!value.empty()) {
+    if (starts_with(value, "[")) {
+      // its a format statement type value eg [SourceFile], need to get the appropriate metadata
+      value = substr(findchar(value.begin(), value.end(), '[')+1,findchar(value.begin(), value.end(), ']') );
+      value = get_metadata_value(docInfo, value);
+    }
+    
+    if (!value.empty()) {
+      text_t assocfilepath = get_metadata_value(docInfo, "assocfilepath");
+      if (!assocfilepath.empty()) {
+    value = this->oaiConfigure->getBaseDocRoot()+"/collect/"+collection+"/index/assoc/"+assocfilepath+"/"+value;
+    values.push_back(value);
+      } else {
+    value = "";
       }
-      
-      if (!value.empty()) {
-    text_t assocfilepath = get_metadata_value(docInfo, "assocfilepath");
-    if (!assocfilepath.empty()) {
-      value = this->oaiConfigure->getBaseDocRoot()+"/collect/"+collection+"/index/assoc/"+assocfilepath+"/"+value;
-    } else {
-      value = "";
-    }
-      }
-    } 
+    }
   }
-  if (!value.empty()) {
-    if (!headerDone) {
-      this->output_metadata_header(output);
-      headerDone = true;
-    }
+  // now add link
+  value = this->oaiConfigure->getBaseLibraryURL()+"?a=d&c="+collection+"&d="+docInfo.OID;
+  values.push_back(value);
+
+  if (!headerDone) {
+    this->output_metadata_header(output);
+    headerDone = true;
+  }
+  for (int i=0; i<values.size(); i++) {
     if (this->oaiConfigure->getOAIVersion() >= 200) { 
-      output << outconvert << "        <dc:identifier>" << xml_safe(value) << "</dc:identifier>\n";
+      output << outconvert << "        <dc:identifier>" << xml_safe(values[i]) << "</dc:identifier>\n";
     }
     else {
-      output << outconvert << "        <identifier>"  << xml_safe(value) << "</identifier>\n";
+      output << outconvert << "        <identifier>"  << xml_safe(values[i]) << "</identifier>\n";
     }
   }
+  
   return true;
 }