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

Timestamp:

2010-03-01T13:04:36+13:00 (14 years ago)

Author:

kjdon

Message:

should be using assocfilepath instead of archivedir

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

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

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

@@ -709 +709 @@
 
   // _thisOID_              the OID (directory) of the current document - this corresponds
-  //                        to the archivedir metadata element
+  //                        to the assocfilepath metadata element
 
   // _documentheader_       Custom header info for the specified document
@@ -753 +753 @@
     // we're at document level
 
-    metadata.insert ("archivedir");
+    metadata.insert ("assocfilepath");
 
     comerror_t err;
@@ -856 +856 @@
     
       if (is_top (arg_d))
-    disp.setmacro ("thisOID", displayclass::defaultpackage, dm_safe(response.docInfo[0].metadata["archivedir"].values[0]));
+    disp.setmacro ("thisOID", displayclass::defaultpackage, dm_safe(response.docInfo[0].metadata["assocfilepath"].values[0]));
       else {
-    MetadataInfo_t *parentad = response.docInfo[0].metadata["archivedir"].parent;
+    MetadataInfo_t *parentad = response.docInfo[0].metadata["assocfilepath"].parent;
     text_t thisOID;
     while (parentad != NULL) {