Changeset 24020

Show
Ignore:
Timestamp:
17.05.2011 16:19:01 (8 years ago)
Author:
sjm84
Message:

Updating this file so that it works with the "contains" method used in the Java code rather than the previous regular expression method

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/sites/localsite/siteConfig.xml

    r21313 r24020  
    3434     <replace macro="_iconunknown_" scope="metadata" text="&lt;img src='interfaces/default/images/iunknown.gif' border='0'/&gt;" resolve="false"/> 
    3535 
    36     <replace macro="\[archivedir\]" scope="all" metadata="archivedir" resolve="false"/> 
    37     <replace macro="\[assocfilepath\]" scope="metadata" metadata="assocfilepath" resolve="false"/> 
    38     <replace macro="\[srcurl\]" scope="metadata" metadata="srcurl" resolve="false"/> 
    39     <replace macro="\[SourceFile\]" scope="metadata" metadata="SourceFile" resolve="false"/> 
     36    <replace macro="[archivedir]" scope="all" metadata="assocfilepath" resolve="false"/> 
     37    <replace macro="[assocfilepath]" scope="all" metadata="assocfilepath" resolve="false"/> 
     38    <replace macro="[Image]" scope="metadata" metadata="Image" resolve="false"/> 
     39    <replace macro="[Thumb]" scope="metadata" metadata="Thumb" resolve="false"/> 
     40    <replace macro="[ThumbWidth]" scope="metadata" metadata="ThumbWidth" resolve="false"/> 
     41    <replace macro="[ThumbHeight]" scope="metadata" metadata="ThumbHeight" resolve="false"/> 
     42    <replace macro="[srcurl]" scope="metadata" metadata="srcurl" resolve="false"/> 
     43    <replace macro="[SourceFile]" scope="metadata" metadata="SourceFile" resolve="false"/> 
    4044    <!-- _httpsite_ and _clustername_ are macros that are defined in the java code --> 
    4145    <replace macro="_httpcollection_" scope="metadata" text="_httpsite_/collect/_clustername_" resolve="true"/> 
    4246    <replace macro="_httpprefix_" scope="metadata" text="_httpsite_" resolve="true"/> 
    43     <replace macro="_httpdocimg_" scope="text" text="_httpsite_/collect/_clustername_/index/assoc/[archivedir]/" resolve="true"/> 
    44     <replace macro="\[collection\]" scope="all" text="_clustername_" resolve="true"/> 
     47    <replace macro="_httpdocimg_" scope="text" text="_httpsite_/collect/_clustername_/index/assoc/[assocfilepath]/" resolve="true"/> 
     48    <replace macro="[collection]" scope="all" text="_clustername_" resolve="true"/> 
    4549    <replace macro="_httpextlink_" scope="all" text="_libraryname_?el=&amp;a=d&amp;c=_clustername_&amp;d=" resolve="true"/> 
    4650  </replaceList> 
    47   <replaceList  id="gs2-image"> 
    48     <replace macro="\[Image\]" scope="metadata" metadata="Image" resolve="false"/> 
    49     <replace macro="\[Thumb\]" scope="metadata" metadata="Thumb" resolve="false"/> 
    50     <replace macro="\[ThumbWidth\]" scope="metadata" metadata="ThumbWidth" resolve="false"/> 
    51     <replace macro="\[ThumbHeight\]" scope="metadata" metadata="ThumbHeight" resolve="false"/> 
    52     <replace macro="\[Screen\]" scope="metadata" metadata="Screen" resolve="false"/> 
    53     <replace macro="\[ScreenWidth\]" scope="metadata" metadata="ScreenWidth" resolve="false"/> 
    54     <replace macro="\[ScreenHeight\]" scope="metadata" metadata="ScreenHeight" resolve="false"/> 
    55   </replaceList> 
     51 
    5652    <metadataList xmlns:gsf="http://www.greenstone.org/greenstone3/schema/MetadataFormat" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 
    5753        <metadata name="siteURL">http://localhost:8080/greenstone3/</metadata>