Changeset 22214 for main

Timestamp:

2010-06-01T15:22:29+12:00 (14 years ago)

Author:

kjdon

Message:

tidied up output_custom_metadata. when outputing dc.Identifier, it will first look for gs.OAIResourceURL (user defined link to the document), then for srclink_file (greenstone defined source file stored in index/assoc), the it will output a link to the greenstone version

File:

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

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

@@ -74 +74 @@
 
 bool dublin_core::output_custom_metadata(ostream &output, outconvertclass &outconvert, bool &headerDone, const text_t &collection, ResultDocInfo_t &docInfo) {
-  text_t value = get_metadata_value(docInfo, "srclink_file");
+  text_t value = get_metadata_value(docInfo, "gs.OAIResourceURL");
   if (value.empty()) {
-    value = "gs doc"; // todo, situation where no source doc.
-  } 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);
-    }
+    // try srclink_file
+    value = get_metadata_value(docInfo, "srclink_file");
+    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()) {
+    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()) {
-    text_t assocfilepath = get_metadata_value(docInfo, "assocfilepath");
-    if (!assocfilepath.empty()) {
-      value = this->oaiConfigure->getCollectionConfig("", "baseDocRoot")+"/collect/"+collection+"/index/assoc/"+assocfilepath+"/"+value;
-    } else {
-      value = "";
-    }
-    
-  } 
   if (!value.empty()) {
     if (!headerDone) {