Changeset 37301

Timestamp:

2023-02-08T00:19:19+13:00 (8 months ago)

Author:

davidb

Message:

Changed to work with whatever port GS3 install has specified, rather then assuming 8383

Location:

gs2-extensions/apache-jena/trunk/src/src3

Files:

• gs-triplestore-add3 (modified) (2 diffs)
• gs-triplestore-dataset-delete3 (modified) (1 diff)
• gs-triplestore-query3 (modified) (2 diffs)
• gs-triplestore-reset3 (modified) (2 diffs)

gs2-extensions/apache-jena/trunk/src/src3/gs-triplestore-add3

@@ -14 +14 @@
     graph_uri="$FULL_GREENSTONE_URL_PREFIX/collection/$graph_name"
 else
-    graph_uri="http://localhost:8383/greenstone3/library/collection/$graph_name"
+    graph_uri="http://localhost:$port/greenstone3/library/collection/$graph_name"
 fi
 
@@ -24 +24 @@
 export PATH=/usr/bin:$PATH
 
+echo s-post http://localhost:$port/fuseki3/greenstone/data "$graph_uri" "$file_ttl"
 s-post http://localhost:$port/fuseki3/greenstone/data "$graph_uri" "$file_ttl"
 

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

@@ -23 +23 @@
 
 
-echo ""
-echo "Early testing with this script did see it report an HTTP Reponse:"
-echo "    ERROR 500: (no description)"
-echo "The Fuseki server then no longer listed the dataset, but on the filesystem"
-echo "it was still there in the run3/databases/ directory"
-echo "Catalina.out error message:"
-echo "  Admin      INFO  [1979] DELETE dataset=/mydataset"
-echo "  Admin      WARN  [1979] RC = 500 : Already closed"
-echo ""
+#echo ""
+#echo "Early testing with this script did see it report an HTTP Reponse:"
+#echo "    ERROR 500: (no description)"
+#echo "The Fuseki server then no longer listed the dataset, but on the filesystem"
+#echo "it was still there in the run3/databases/ directory"
+#echo "Catalina.out error message:"
+#echo "  Admin      INFO  [1979] DELETE dataset=/mydataset"
+#echo "  Admin      WARN  [1979] RC = 500 : Already closed"
+#echo ""

gs2-extensions/apache-jena/trunk/src/src3/gs-triplestore-query3

@@ -8 +8 @@
 port=${FUSEKI3_PORT:-8383}
 
-#pushd "$GEXT_JENA" 
 
 # The following line helps with runing a she-bang line of:
@@ -18 +17 @@
 s-query --service http://localhost:$port/fuseki3/greenstone/query "$*"
 
-
-#popd

gs2-extensions/apache-jena/trunk/src/src3/gs-triplestore-reset3

@@ -14 +14 @@
     graph_uri="$FULL_GREENSTONE_URL_PREFIX/collection/$graph_name"
 else
-    graph_uri="http://localhost:8383/greenstone3/library/collection/$graph_name"
+    graph_uri="http://localhost:$port/greenstone3/library/collection/$graph_name"
 fi
 
@@ -23 +23 @@
 export PATH=/usr/bin:$PATH
 
+echo s-update --service http://localhost:$port/fuseki3/greenstone/update "DROP GRAPH <$graph_uri>"
 s-update --service http://localhost:$port/fuseki3/greenstone/update "DROP GRAPH <$graph_uri>"