Changeset 21743


Ignore:
Timestamp:
2010-03-01T13:04:36+13:00 (12 years ago)
Author:
kjdon
Message:

should be using assocfilepath instead of archivedir

Location:
main/trunk/greenstone2/runtime-src/src/recpt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/recpt/browsetoolsclass.cpp

    r16481 r21743  
    104104text_t browsetoolsclass::get_cover_image()
    105105{
    106   return "_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):archivedir],[archivedir]}/cover.jpg";
     106  return "_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):assocfilepath],[assocfilepath]}/cover.jpg";
    107107}
    108108
  • main/trunk/greenstone2/runtime-src/src/recpt/documentaction.cpp

    r20917 r21743  
    709709
    710710  // _thisOID_              the OID (directory) of the current document - this corresponds
    711   //                        to the archivedir metadata element
     711  //                        to the assocfilepath metadata element
    712712
    713713  // _documentheader_       Custom header info for the specified document
     
    753753    // we're at document level
    754754
    755     metadata.insert ("archivedir");
     755    metadata.insert ("assocfilepath");
    756756
    757757    comerror_t err;
     
    856856   
    857857      if (is_top (arg_d))
    858     disp.setmacro ("thisOID", displayclass::defaultpackage, dm_safe(response.docInfo[0].metadata["archivedir"].values[0]));
     858    disp.setmacro ("thisOID", displayclass::defaultpackage, dm_safe(response.docInfo[0].metadata["assocfilepath"].values[0]));
    859859      else {
    860     MetadataInfo_t *parentad = response.docInfo[0].metadata["archivedir"].parent;
     860    MetadataInfo_t *parentad = response.docInfo[0].metadata["assocfilepath"].parent;
    861861    text_t thisOID;
    862862    while (parentad != NULL) {
Note: See TracChangeset for help on using the changeset viewer.