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

Timestamp:

2024-04-11T12:44:19+12:00 (3 weeks ago)

Author:

kjdon

Message:

added archivedir option for backwards compatibility for old pre built collections

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• browsetoolsclass.cpp (modified) (1 diff)
• documentaction.cpp (modified) (3 diffs)

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

@@ -105 +105 @@
 text_t browsetoolsclass::get_cover_image()
 {
-  return "_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):assocfilepath],[assocfilepath]}/cover.jpg";
+  return "_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):assocfilepath],[assocfilepath],[parent(Top):archivedir],[archivedir]}/cover.jpg";
 }
 
 text_t browsetoolsclass::get_assocfile_path()
 {
-  return "_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):assocfilepath],[assocfilepath]}/";
+  return "_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):assocfilepath],[assocfilepath],[parent(Top):archivedir],[archivedir]}/";
 
 }

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

@@ -770 +770 @@
 
     metadata.insert ("assocfilepath");
-
+    metadata.insert("archivedir"); // backwards compatibility
     comerror_t err;
     OptionValue_tarray options;
@@ -884 +884 @@
       }
     
-      if (is_top (arg_d))
-    disp.setmacro ("thisOID", displayclass::defaultpackage, dm_safe(response.docInfo[0].metadata["assocfilepath"].values[0]));
-      else {
+      if (is_top (arg_d)) {
+        text_t thisOID = response.docInfo[0].metadata["assocfilepath"].values[0];
+        if (thisOID.empty()) {
+          thisOID = response.docInfo[0].metadata["archivedir"].values[0];
+        }
+    disp.setmacro ("thisOID", displayclass::defaultpackage, dm_safe(thisOID));
+      }
+        else {
     MetadataInfo_t *parentad = response.docInfo[0].metadata["assocfilepath"].parent;
     text_t thisOID;
@@ -893 +898 @@
       parentad = parentad->parent;
     }
+        if (thisOID.empty()) {
+          // try archivedir
+          MetadataInfo_t *parentad = response.docInfo[0].metadata["archivedir"].parent;
+          while (parentad != NULL) {
+            thisOID = parentad->values[0];
+            parentad = parentad->parent;
+          }
+        }
     disp.setmacro ("thisOID", displayclass::defaultpackage, dm_safe(thisOID));
       }