Changeset 32435

Timestamp:

2018-09-10T15:07:49+12:00 (6 years 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:

• build.xml (modified) (7 diffs)
• web/sites/localsite/collect/gs2mgdemo/index-and-archives.zip (added)
• web/sites/localsite/collect/gs2mgdemo/index.zip (deleted)
• web/sites/localsite/collect/gs2mgppdemo/index-and-archives.zip (added)
• web/sites/localsite/collect/gs2mgppdemo/index.zip (deleted)
• web/sites/localsite/collect/lucene-jdbm-demo/index-and-archives.zip (added)
• web/sites/localsite/collect/lucene-jdbm-demo/index.zip (deleted)

main/trunk/greenstone3/build.xml

@@ -1394 +1394 @@
     description="Unpack all the collections from their svn zipped versions">
     <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
-    <property name="index.zip" value="index.zip"/>
+    <property name="index-and-archives.zip" value="index-and-archives.zip"/>
 
     <echo message="installing collections..."/>
@@ -1408 +1408 @@
     <condition property="gs2mgdemo.present">
       <and>
-        <available file="${gs2mgdemo.dir}/${index.zip}"/>
+        <available file="${gs2mgdemo.dir}/${index-and-archives.zip}"/>
       </and>
     </condition>
@@ -1414 +1414 @@
 
   <target name="gs2mgdemo-install" if="gs2mgdemo.present" depends="gs2mgdemo-prepare">
-    <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${index.zip}" />
+    <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${index-and-archives.zip}" />
     <echo>collection gs2mgdemo installed</echo>
   </target>
@@ -1423 +1423 @@
     <condition property="gs2mgppdemo.present">
       <and>
-        <available file="${gs2mgppdemo.dir}/${index.zip}"/>
+        <available file="${gs2mgppdemo.dir}/${index-and-archives.zip}"/>
       </and>
     </condition>
@@ -1429 +1429 @@
 
   <target name="gs2mgppdemo-install" if="gs2mgppdemo.present" depends="gs2mgppdemo-prepare">
-    <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${index.zip}" />
+    <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${index-and-archives.zip}" />
     <echo>collection gs2mgppdemo installed</echo>
   </target>    
@@ -1435 +1435 @@
   <target name="gberg-prepare" if="collect.dir">
     <property name="gberg.dir" value="${collect.dir}/gberg"/>
-    <available file="${gberg.dir}/index/${index.zip}" property="gberg.present"/>
+    <available file="${gberg.dir}/index/index.zip" property="gberg.present"/>
   </target>
 
   <target name="gberg-install" if="gberg.present" depends="gberg-prepare">
-    <unzip dest="${gberg.dir}/index" src="${gberg.dir}/index/${index.zip}"/>
+    <unzip dest="${gberg.dir}/index" src="${gberg.dir}/index/index.zip"/>
     <echo>collection gberg installed</echo>
   </target>
@@ -1445 +1445 @@
   <target name="lucene-jdbm-demo-prepare" if="collect.dir">
     <property name="lucene-jdbm-demo.dir" value="${collect.dir}/lucene-jdbm-demo"/>
-    <available file="${lucene-jdbm-demo.dir}/${index.zip}" property="lucene-jdbm-demo.present"/>
+    <available file="${lucene-jdbm-demo.dir}/${index-and-archives.zip}" property="lucene-jdbm-demo.present"/>
   </target>
 
   <target name="lucene-jdbm-demo-install" if="lucene-jdbm-demo.present" depends="lucene-jdbm-demo-prepare">
-    <unzip dest="${lucene-jdbm-demo.dir}" src="${lucene-jdbm-demo.dir}/${index.zip}"/>
+    <unzip dest="${lucene-jdbm-demo.dir}" src="${lucene-jdbm-demo.dir}/${index-and-archives.zip}"/>
     <echo>collection lucene-jdbm-demo installed</echo>
   </target>