Changeset 24226

Timestamp:

2011-07-04T20:14:04+12:00 (12 years ago)

Author:

ak19

Message:

Still on ticket 449. Now srclink_file metadata (contains an underscore that makes things difficult for GS3) is renamed to srclinkFile. Related commits are in perllib and GS3's default/transform/config_format.xsl and Action.java.

Location:

main/trunk/greenstone2/runtime-src/src

Files:

• oaiservr/dublincore.cpp (modified) (1 diff)
• recpt/formattools.cpp (modified) (3 diffs)

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

@@ -102 +102 @@
   text_t value = get_metadata_value(docInfo, "gs.OAIResourceURL");
   if (value.empty()) {
-    // try srclink_file
-    value = get_metadata_value(docInfo, "srclink_file");
+    // 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 

main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

@@ -652 +652 @@
     formatlistptr->command = comEndLink;
 
+  // the metaname "srclink_file" is deprecated, use "srclinkFile"
   else if (meta == "srclink") {
     formatlistptr->command = comAssocLink;
-    formatlistptr->meta.metaname = "srclink_file";
-    metadata.insert("srclink_file");
+    formatlistptr->meta.metaname = "srclinkFile";
+    metadata.insert("srclinkFile");
   }
   else if (meta == "srchref") {
     formatlistptr->command = comAssocLink;
     formatlistptr->text = "href";
-    formatlistptr->meta.metaname = "srclink_file";
-    metadata.insert("srclink_file");
+    formatlistptr->meta.metaname = "srclinkFile";
+    metadata.insert("srclinkFile");
   }
   else if (meta == "/srclink") {
     formatlistptr->command = comEndAssocLink;
-    formatlistptr->meta.metaname = "srclink_file";
+    formatlistptr->meta.metaname = "srclinkFile";
   }
   // and weblink etc
@@ -1091 +1092 @@
     fresh_metatext = text_html_safe;
       }
-      // New "dmsafe" special formatting option (always apply to "srclink_file" metadata)
-      if (meta.metacommand & mDMSafe || meta.metaname == "srclink_file")
+      // New "dmsafe" special formatting option (always apply to "srclinkFile" metadata)
+      // (The metaname "srclink_file" is deprecated, use "srclinkFile")
+      if (meta.metacommand & mDMSafe || meta.metaname == "srclinkFile")
       {
     // Make it macro-safe
@@ -1170 +1172 @@
       fresh_metatext = text_html_safe;
     }
-    // New "dmsafe" special formatting option (always apply to "srclink_file" metadata)
-    if (meta.metacommand & mDMSafe || meta.metaname == "srclink_file")
+    // New "dmsafe" special formatting option (always apply to "srclinkFile" metadata)
+    // (The metaname "srclink_file" is deprecated, use "srclinkFile")
+    if (meta.metacommand & mDMSafe || meta.metaname == "srclinkFile")
     {
       // Make it macro-safe