Changeset 32435

Show
Ignore:
Timestamp:
10.09.2018 15:07:49 (10 months ago)
Author:
ak19
Message:

gs2mgdemo, gs2mgppdemo and lucene-jdbm-demo are meant to work out of the box (the first 2 are only present in svn checked out GS3s). To this end, these collections now need the archives folder as well for doc editing to work, as archives is now used by doc editing and no longer index. Also needed to rebuild the index folder for these 3 collections for everything to be up to date (without rebuilding index, in doc editing mode I just see the nav bar followed by footer instead of doc content). Have not updated the gutenberg collection yet as it's different.

Location:
main/trunk/greenstone3
Files:
3 added
3 removed
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r32432 r32435  
    13941394    description="Unpack all the collections from their svn zipped versions"> 
    13951395    <property name="collect.dir" value="${web.home}/sites/localsite/collect"/> 
    1396     <property name="index.zip" value="index.zip"/> 
     1396    <property name="index-and-archives.zip" value="index-and-archives.zip"/> 
    13971397 
    13981398    <echo message="installing collections..."/> 
     
    14081408    <condition property="gs2mgdemo.present"> 
    14091409      <and> 
    1410         <available file="${gs2mgdemo.dir}/${index.zip}"/> 
     1410        <available file="${gs2mgdemo.dir}/${index-and-archives.zip}"/> 
    14111411      </and> 
    14121412    </condition> 
     
    14141414 
    14151415  <target name="gs2mgdemo-install" if="gs2mgdemo.present" depends="gs2mgdemo-prepare"> 
    1416     <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${index.zip}" /> 
     1416    <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${index-and-archives.zip}" /> 
    14171417    <echo>collection gs2mgdemo installed</echo> 
    14181418  </target> 
     
    14231423    <condition property="gs2mgppdemo.present"> 
    14241424      <and> 
    1425         <available file="${gs2mgppdemo.dir}/${index.zip}"/> 
     1425        <available file="${gs2mgppdemo.dir}/${index-and-archives.zip}"/> 
    14261426      </and> 
    14271427    </condition> 
     
    14291429 
    14301430  <target name="gs2mgppdemo-install" if="gs2mgppdemo.present" depends="gs2mgppdemo-prepare"> 
    1431     <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${index.zip}" /> 
     1431    <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${index-and-archives.zip}" /> 
    14321432    <echo>collection gs2mgppdemo installed</echo> 
    14331433  </target>     
     
    14351435  <target name="gberg-prepare" if="collect.dir"> 
    14361436    <property name="gberg.dir" value="${collect.dir}/gberg"/> 
    1437     <available file="${gberg.dir}/index/${index.zip}" property="gberg.present"/> 
     1437    <available file="${gberg.dir}/index/index.zip" property="gberg.present"/> 
    14381438  </target> 
    14391439 
    14401440  <target name="gberg-install" if="gberg.present" depends="gberg-prepare"> 
    1441     <unzip dest="${gberg.dir}/index" src="${gberg.dir}/index/${index.zip}"/> 
     1441    <unzip dest="${gberg.dir}/index" src="${gberg.dir}/index/index.zip"/> 
    14421442    <echo>collection gberg installed</echo> 
    14431443  </target> 
     
    14451445  <target name="lucene-jdbm-demo-prepare" if="collect.dir"> 
    14461446    <property name="lucene-jdbm-demo.dir" value="${collect.dir}/lucene-jdbm-demo"/> 
    1447     <available file="${lucene-jdbm-demo.dir}/${index.zip}" property="lucene-jdbm-demo.present"/> 
     1447    <available file="${lucene-jdbm-demo.dir}/${index-and-archives.zip}" property="lucene-jdbm-demo.present"/> 
    14481448  </target> 
    14491449 
    14501450  <target name="lucene-jdbm-demo-install" if="lucene-jdbm-demo.present" depends="lucene-jdbm-demo-prepare"> 
    1451     <unzip dest="${lucene-jdbm-demo.dir}" src="${lucene-jdbm-demo.dir}/${index.zip}"/> 
     1451    <unzip dest="${lucene-jdbm-demo.dir}" src="${lucene-jdbm-demo.dir}/${index-and-archives.zip}"/> 
    14521452    <echo>collection lucene-jdbm-demo installed</echo> 
    14531453  </target>