Changeset 34867

Timestamp:

2021-02-15T22:36:05+13:00 (3 years ago)

Author:

davidb

Message:

Tweaks after testing

Location:

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare

Files:

• 02-EXPLODE-SPARQLRESULTS-TO-IMPORT.sh (modified) (1 diff)
• 05-COPY-VOTING-METADATA-TO-IMPORT.sh (modified) (2 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/02-EXPLODE-SPARQLRESULTS-TO-IMPORT.sh

@@ -1 +1 @@
 #!/bin/bash
 
-if [ ! -d tmp ] ; then
-    echo "Making temporary directory: tmp"
-    mkdir tmp
+tmp_cache="tmp-cache"
+
+echo ""
+
+if [ "x$GSDL3SRCHOME" = "x" ] ; then
+   echo "Environment variable GSDL3SRCHOME not set." 1>&2
+   echo "Have you sourced ./gs3-setup.sh?" 1>&2
+   exit 1
+fi
+   
+if [ ! -d $tmp_cache ] ; then
+    echo "Making temporary directory:"
+    echo "  $tmp_cache"
+    mkdir $tmp_cache
+else
+    echo "Removing existing content from:"
+    echo "  $tmp_cache"
+    /bin/rm -rf $tmp_cache/*
 fi
 
-echo "Creating temporary copies:"
+echo "Copying to '$tmp_cache' then exploding:"
 
 for f in "local--countries-in-esc-by-year-after-1956--with-errata.json" ; do
     
-    echo "  errata-lod/$f -> tmp/sparqlresults-$f"    
-    /bin/cp "errata-lod/$f" "tmp/sparqlresults-$f"
+    echo "  errata-lod/$f -> $tmp_cache/sparqlresults-$f"    
+    /bin/cp "errata-lod/$f" "$tmp_cache/sparqlresults-$f"
+
+    # rm -rf tmp/sparqlresults-local--countries-in-esc-by-year-after-1956--with-errata.* &&  cp import/sparqlresults-local--countries-in-esc-by-year-after-1956--with-errata.json  tmp/.
+
+    explode_metadata_database.pl \
+      -collectdir $GSDL3SRCHOME/web/sites/eurovision-lod/collect \
+      -collection eurovision \
+      -plugin_options "-metadata_merge_on_concat_fields Country,Year -OIDtype assigned -OIDmetadata Identifier" \
+      -plugin JSONSPARQLResultPlugin  \
+      $tmp_cache/sparqlresults-$f
+
+#      -use_collection_plugin_options \
+
+    if [ $? != 0 ] ; then
+    echo "Error encountered when exploding:" 1>&2
+    echo "  $tmp_cache/sparqlresults-$f" 1>&2
+    exit 1
+    fi
 done
-    
-echo "Regenerating sparqlresults-* files in '../import' (from exploded results in 'tmp')"
+
+echo ""
+echo "Regenerating sparqlresults-* files in '../import' (from exploded results in '$tmp_cache')"
 
 /bin/rm -rf ../import/sparqlresults-*
-/bin/mv tmp/sparqlresults-* ../import/.
+/bin/mv $tmp_cache/sparqlresults-* ../import/.
 
-
+echo ""

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/05-COPY-VOTING-METADATA-TO-IMPORT.sh

@@ -2 +2 @@
 
 
+echo ""
 echo "Copying:"
 
@@ -12 +13 @@
     
 
+echo ""