Changeset 38281 for gs3-installations

Timestamp:

2023-10-03T17:29:42+13:00 (9 months ago)

Author:

davidb

Message:

Changes after rebuild with streamlined fuseki3.war

Location:

gs3-installations/intermuse/trunk/sites/intermuse/collect/demo-localhost

Files:

• BUILDCOL.sh (modified) (2 diffs)
• IMPORT.sh (modified) (3 diffs)
• INDEX-IIIF-MANIFEST.sh (modified) (2 diffs)
• RESET-ANNOTATION-STORE.sh (modified) (1 diff)

gs3-installations/intermuse/trunk/sites/intermuse/collect/demo-localhost/BUILDCOL.sh

@@ -2 +2 @@
 
 source ../_local_collect_config.sh
+
+if [ "x$GSDL3SRCHOME" = "x" ] ; then
+    pushd ../../../../../ && . ./SETUP.bash && popd
+fi
 
 echo "***"
@@ -14 +18 @@
 echo "Obtaining lock: gs3-building.flock"
 
-#sudo -u $gs_server_username -- \
-bash -c "pushd ../../../../../ && . ./gs3-setup.sh && popd && flock gs3-building.flock buildcol.pl -removeold -site $site $col $*"
+# This used to be done with "bash -c" but not sure why
+# Perhaps 'flock' doesn't work with combined with nohup directly?
+
+if [ $gs_server_username != $USER ] ; then
+    sudo -u $gs_server_username -- \
+     flock gs3-building.flock buildcol.pl -removeold -site $site $col $*
+else
+    flock gs3-building.flock buildcol.pl -removeold -site $site $col $*
+fi
 
 echo "Releasing lock: gs3-building.flock"
+/bin/rm gs3-building.flock
 
 

gs3-installations/intermuse/trunk/sites/intermuse/collect/demo-localhost/IMPORT.sh

@@ -2 +2 @@
 
 source ../_local_collect_config.sh
+
+if [ "x$GSDL3SRCHOME" = "x" ] ; then
+    pushd ../../../../../ && . ./SETUP.bash && popd
+fi
+    
 
 echo "***"
@@ -12 +17 @@
 
 
+
 echo "Obtaining lock: gs3-building.flock"
 
-#sudo -u $gs_server_username -- \
-bash -c "pushd ../../../../../ && . ./gs3-setup.sh && popd && flock gs3-building.flock import.pl -removeold -site $site $col $*"
+
+if [ $gs_server_username != $USER ] ; then
+    sudo -u $gs_server_username -- \
+     flock gs3-building.flock import.pl -removeold -site $site $col $*
+else
+    flock gs3-building.flock import.pl -removeold -site $site $col $*
+fi
 
 echo "Releasing lock: gs3-building.flock"
+/bin/rm gs3-building.flock
 
 
@@ -34 +46 @@
 echo "Before running ./BUILDCOL.sh consider whether you want to 'hard-reset' "
 echo "the triplestore:"
-echo "    pushd $GSDL3SRCHOME"
 echo "    ./RESET-ANNOTATION-STORE.sh"
-echo "    popd"
 echo "****"
 echo "****"

gs3-installations/intermuse/trunk/sites/intermuse/collect/demo-localhost/INDEX-IIIF-MANIFEST.sh

@@ -37 +37 @@
 # and that version of the file is POSTed to /simpleAnnotationStore/manifests
 
+pid=$$
+
 echo ""
 echo "Downloading openannotation JSON for $docid as workaround to strip out leading blank space"
 echo "  $download_url"
 echo ""
-curl "$download_url" | egrep -v "^\\s*$" > tmp/doc-openannotation--with-otherContent--pid$$.json
+curl --silent "$download_url" | egrep -v "^\\s*$" > tmp/doc-openannotation--with-otherContent--pid$pid.json
 
 
-iuri="$gs_library_url/sites/$site/collect/$col/tmp/doc-openannotation--with-otherContent--pid$$.json"
+iuri="$gs_library_url/sites/$site/collect/$col/tmp/doc-openannotation--with-otherContent--pid$pid.json"
 
 #internal_url_base="http://localhost:4343/simpleAnnotationStore"
@@ -55 +57 @@
 echo curl -X POST -d \"uri=${iuri}\" \"$post_url\"
 #echo "[Dry run, suppressing curl]"
-curl -X POST -d "uri=${iuri}" "$post_url"
+curl --silent -X POST -d "uri=${iuri}" "$post_url"
 
 if [ $? = 0 ] ; then
-    /bin/rm tmp/doc-openannotation--with-otherContent--pid$$.json
+    /bin/rm tmp/doc-openannotation--with-otherContent--pid$pid.json
 fi
 
 echo ""
 
-
-# Returns JSON output of the form:
+# The above curl POST returns JSON output of the form:
 #   {"loaded":{"short_id":"f3bac06f17c9240b76b082dbdcbb365a","uri":"http://ld.greenstone.org/intermuse/programmes/HASH012cd965c3e83d504f4a78cd/manifest"}}
 
-# The short_id is needed to ...
-
+# It might be the short_id is need for a later step in Greenstone, a comment to this affect was left in this script:
+#
+#    The short_id is needed to ... 
+#
+# However no other detail given, and at present the features that are needed in Mirador appear to work OK
+#
+# Legacy comment written during a development phase that is no longer relevant/required??
 
 # {"loaded":{"short_id":"e2465cd7e5174f2720cee110d9b4a06a","uri":"http://ld.greenstone.org/intermuse/programmes-and-performers/HASH012cd965c3e83d504f4a78cd/manifest"}}+ echo ''

gs3-installations/intermuse/trunk/sites/intermuse/collect/demo-localhost/RESET-ANNOTATION-STORE.sh

@@ -6 +6 @@
 pushd "$GSDL3SRCHOME"
 
-#rm -rf gs2build/ext/apache-jena/etc/tdb-triple-store3
 
 ./ant-stop-with-exts.sh
 ant reset-logs
 
-# rm -rf packages/tomcat/bin/data
+if [ -d packages/tomcat/bin/data ] ; then
+    echo "Removing packages/tomcat/bin/data"
+    rm -rf packages/tomcat/bin/data
+fi
+
+if [ -d ext/jena-fuseki/run3/database/greenstone ] ; then
+       
+    echo "Removing ext/jena-fuseki/run3/database/greenstone"
+    rm -rf ext/jena-fuseki/run3/database/greenstone
+fi  
+
+# Old gs2buidl ext ...
+#rm -rf gs2build/ext/apache-jena/etc/tdb-triple-store3
+
 
 ./ant-start-with-exts.sh