Changeset 35852

Timestamp:

2022-01-02T17:43:28+13:00 (2 years ago)

Author:

davidb

Message:

Fixed the 'collectdir' value so it works in any Geenstone3 site/col installation

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/02-EXPLODE-SPARQLRESULTS-TO-IMPORT.sh (modified) (4 diffs)

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

@@ -6 +6 @@
 cwd_without_prepare=${cwd%/*}
 collection=${cwd_without_prepare##*/}
+
+full_collectdir=${cwd_without_prepare%/*}
 
 echo ""
@@ -44 +46 @@
     /bin/cp "errata-lod/$f" "$tmp_cache/sparqlresults-$f"
 
-    fgrep in-1956 $f > /dev/null
+    echo $f | fgrep in-1956 > /dev/null
     in_1956_status=$?
     
@@ -50 +52 @@
     # matches substring check
     explode_metadata_database.pl \
-        -collectdir $GSDL3SRCHOME/web/sites/eurovision-lod/collect \
+        -collectdir "$full_collectdir" \
         -collection $collection \
         -plugin_options "-metadata_merge_on_concat_fields Country,Year,TitleDisambiguation -OIDtype assigned -OIDmetadata Identifier" \
@@ -58 +60 @@
     else
     explode_metadata_database.pl \
-        -collectdir $GSDL3SRCHOME/web/sites/eurovision-lod/collect \
+        -collectdir "$full_collectdir" \
         -collection $collection \
         -plugin_options "-metadata_merge_on_concat_fields Country,Year -OIDtype assigned -OIDmetadata Identifier" \