Changeset 24226


Ignore:
Timestamp:
2011-07-04T20:14:04+12:00 (10 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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/oaiservr/dublincore.cpp

    r22739 r24226  
    102102  text_t value = get_metadata_value(docInfo, "gs.OAIResourceURL");
    103103  if (value.empty()) {
    104     // try srclink_file
    105     value = get_metadata_value(docInfo, "srclink_file");
     104    // try srclinkFile (the metaname "srclink_file" is deprecated, use "srclinkFile")
     105    value = get_metadata_value(docInfo, "srclinkFile");
    106106    if (value.empty()) {
    107107      // we have no file to link to, so link to the Greenstone version of the
  • main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

    r23707 r24226  
    652652    formatlistptr->command = comEndLink;
    653653
     654  // the metaname "srclink_file" is deprecated, use "srclinkFile"
    654655  else if (meta == "srclink") {
    655656    formatlistptr->command = comAssocLink;
    656     formatlistptr->meta.metaname = "srclink_file";
    657     metadata.insert("srclink_file");
     657    formatlistptr->meta.metaname = "srclinkFile";
     658    metadata.insert("srclinkFile");
    658659  }
    659660  else if (meta == "srchref") {
    660661    formatlistptr->command = comAssocLink;
    661662    formatlistptr->text = "href";
    662     formatlistptr->meta.metaname = "srclink_file";
    663     metadata.insert("srclink_file");
     663    formatlistptr->meta.metaname = "srclinkFile";
     664    metadata.insert("srclinkFile");
    664665  }
    665666  else if (meta == "/srclink") {
    666667    formatlistptr->command = comEndAssocLink;
    667     formatlistptr->meta.metaname = "srclink_file";
     668    formatlistptr->meta.metaname = "srclinkFile";
    668669  }
    669670  // and weblink etc
     
    10911092    fresh_metatext = text_html_safe;
    10921093      }
    1093       // New "dmsafe" special formatting option (always apply to "srclink_file" metadata)
    1094       if (meta.metacommand & mDMSafe || meta.metaname == "srclink_file")
     1094      // New "dmsafe" special formatting option (always apply to "srclinkFile" metadata)
     1095      // (The metaname "srclink_file" is deprecated, use "srclinkFile")
     1096      if (meta.metacommand & mDMSafe || meta.metaname == "srclinkFile")
    10951097      {
    10961098    // Make it macro-safe
     
    11701172      fresh_metatext = text_html_safe;
    11711173    }
    1172     // New "dmsafe" special formatting option (always apply to "srclink_file" metadata)
    1173     if (meta.metacommand & mDMSafe || meta.metaname == "srclink_file")
     1174    // New "dmsafe" special formatting option (always apply to "srclinkFile" metadata)
     1175    // (The metaname "srclink_file" is deprecated, use "srclinkFile")
     1176    if (meta.metacommand & mDMSafe || meta.metaname == "srclinkFile")
    11741177    {
    11751178      // Make it macro-safe
Note: See TracChangeset for help on using the changeset viewer.