Upgrade rdf-toolkit.jar to version 1.14.2 to suppress NamedIndividual assertions. Fixes #774.

bundle.yaml

@@ -3,7 +3,7 @@ variables:
   name: "gist"
   version: "X.x.x"
   input: "."
-  rdf-toolkit: "{input}/tools/rdf-toolkit.jar"
+  rdf-toolkit: "{input}/tools/serializer/rdf-toolkit.jar"
   output: "{name}{version}_webDownload"
 tools:
 - name: "serializer"

docs/release_notes/pr788.md

@@ -0,0 +1,3 @@
+### Patch Updates
+
+* Removed NamedIndividual assertions on instances defined by gist, such as `gist:_second`. Issue [#774](https://github.com/semanticarts/gist/issues/774).

tools/pre-commit → tools/serializer/pre-commit

@@ -8,8 +8,8 @@
 # To enable this hook, save this file to the directory <your git clone root>/.git/hooks
 #
 
-# Customized by the git user
-#export JAVA_HOME="/c/Program Files (x86)/Java/jre1.17.0_201"
+# Customized by the git user - or set JAVA_HOME as persistent environment variable
+# export JAVA_HOME="/c/Program Files (x86)/Java/jre1.17.0_201"
 
 #
 # Redirect all output generated by this script to stderr.
@@ -85,15 +85,15 @@ function findJava() {
 
 function findSerializerJar() {
 
-  # DO NOT MODIFY! Only the version of rdf-toolkit.jar found in ${PWD}/tools/ should be used. Mixing versions may create bogus diffs.
-  RDF_TOOLKIT_JAR="$PWD/tools/rdf-toolkit.jar"
+  # DO NOT MODIFY! Only the version of rdf-toolkit.jar found in ${PWD}/tools/serializer should be used. Mixing versions may create bogus diffs.
+  RDF_TOOLKIT_JAR="$PWD/tools/serializer/rdf-toolkit.jar"
 
   if [ -f "${RDF_TOOLKIT_JAR}" ] ; then
   	log "Found rdf-toolkit: ${RDF_TOOLKIT_JAR}"
   	return 0
   fi
 
-  log_error "Could not find rdf-toolkit.jar in ${PWD}/tools/rdf-toolkit.jar. Please retrieve the file from the git repository. ONLY this version of the file should be used in order to prevent bogus diffs caused by mixing versions."
+  log_error "Could not find rdf-toolkit.jar in ${PWD}/tools/serializer. Please retrieve the file from the git repository. ONLY this version of the file should be used in order to prevent bogus diffs caused by mixing versions."
 
   return 1
 }
@@ -187,7 +187,8 @@ __log_config__
       --target-format ${tfmt} \
       --use-dtd-subset \
       --string-data-typing explicit \
-      --inline-blank-nodes
+      --suppress-named-individuals \
+      --inline-blank-nodes 
     rc=$?
     set +x
 
@@ -250,6 +251,6 @@ function main() {
 main $*
 rc=$?
 if [ $rc -gt 0 ] ; then
-  log_error "Could not commit your files"
+  log_error "Could not commit your files."
 fi
 exit $rc

tools/serialize → tools/serializer/serialize.sh

@@ -30,10 +30,10 @@ serialize_file() {
         echo Skipping file $file. 
         return
     fi
-    echo Reserializing $file into a standard format.
+    echo Serializing $file into a standard format.
     tmp=$file.bak
     cp $file $tmp
-    java -jar `dirname "$0"`/rdf-toolkit.jar -tfmt $format -sdt explicit -dtd -ibn -s $file -t $tmp 
+    java -jar `dirname "$0"`/rdf-toolkit.jar -tfmt $format -sdt explicit -dtd -ibn -sni -s $file -t $tmp 
     mv $tmp $file
 }
 
@@ -55,7 +55,6 @@ fi
 if [ ${#args[@]} -eq 1 ] ; then 
     file=$1      
     if [ -f $file ] ; then
-        echo serializing $file
         serialize_file $file
     elif [ -d $file ]; then
         # Remove a trailing slash (for printing filenames).
@@ -68,4 +67,4 @@ else
     done
 fi
 
-echo Done!
+echo Done serializing files!