Changeset 37274

Timestamp:

2023-02-04T23:12:06+13:00 (8 months ago)

Author:

davidb

Message:

Fine tuning after testing

Location:

gs2-extensions/apache-jena/trunk/src

Files:

• CASCADE-MAKE.sh (modified) (1 diff)
• INSTALL-FUSEKI3-WAR.sh (modified) (1 diff)
• packages/CASCADE-MAKE.sh (modified) (1 diff)
• src3/gs-triplestore-dataset-create3 (modified) (1 diff)
• src3/gs-triplestore-dataset-delete3 (modified) (1 diff)

gs2-extensions/apache-jena/trunk/src/CASCADE-MAKE.sh

@@ -46 +46 @@
   cd web-ext2-js && ./INSTALL.sh && cd ..
 
-  ./INSTALL-FUSEKI-WAR.sh
+  ./INSTALL-FUSEKI3-WAR.sh
   
   cat NOTES.txt

gs2-extensions/apache-jena/trunk/src/INSTALL-FUSEKI3-WAR.sh

@@ -48 +48 @@
 
 echo ""
+echo "Testing to see if /greenstone dataset exists already (ping)"
+gs-triplestore-dataset-ping3 /greenstone
 
+if [ $? != 0 ] ; then
+    # Did not find dataset
+    echo "" >&2
+    echo "Warning: Did not find Fuseki dataset /greenstone" >&2
+    echo "Could be the dataset doesn't exist, or because the server isn't running" >&2
+    echo "" >&2
+
+    echo -n "Do you want to create /greenstone? [y/n]: "
+    read create_dataset
+
+    if [ "x$create_dataset" != "x" ] ; then
+    if [ "$create_dataset" = "y" ] ||  [ "$create_dataset" = "Y" ] ; then
+        #echo "Run the following:"
+        #echo "    " gs-triplestore-dataset-create3 /greenstone
+        echo "Creating the /greenstone dataset"
+        gs-triplestore-dataset-create3 /greenstone
+    fi
+    fi
+    
+fi
+
+echo ""
+

gs2-extensions/apache-jena/trunk/src/packages/CASCADE-MAKE.sh

@@ -8 +8 @@
 source ../cascade-make/lib/cascade-lib.bash GEXT_JENA .. $*
 
-for d in OPENSSL RUBY FUSEKI FUSEKI3 ; do
+#for d in OPENSSL RUBY FUSEKI FUSEKI3 ; do
+for d in OPENSSL RUBY FUSEKI3 ; do
     echo "    Running CASCADE-MAKE/$d.sh"
 

gs2-extensions/apache-jena/trunk/src/src3/gs-triplestore-dataset-create3

@@ -18 +18 @@
 
 
-wget -O - --post-data="dbName=${dataset_name}&dbType=${dataset_type}" "http://localhost:$port//fuseki3/$/datasets"
+wget -O - --post-data="dbName=${dataset_name}&dbType=${dataset_type}" "http://localhost:$port/fuseki3/$/datasets"

gs2-extensions/apache-jena/trunk/src/src3/gs-triplestore-dataset-delete3

@@ -20 +20 @@
 export PATH=/usr/bin:$PATH
 
-wget -O - --method=DELETE "http://localhost:$port//fuseki3/$/datasets/${dataset_name}"
+wget -O - --method=DELETE "http://localhost:$port/fuseki3/$/datasets/${dataset_name}"