Changeset 34855

Timestamp:

2021-02-14T15:58:30+13:00 (3 years ago)

Author:

davidb

Message:

Changes after test-run

Location:

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

Files:

• 03-GEN-PROBLEM-LOD-LISTS.sh (modified) (2 diffs)
• DBPEDIA-LOD-SPARQL-QUERY.sh (modified) (2 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/03-GEN-PROBLEM-LOD-LISTS.sh

@@ -2 +2 @@
 
 
-echo "Copying:"
-echo "  countries-in-esc-by-year.json -> ../import/countries-in-esc-by-year.json"
+#echo "Copying:"
+#echo "  countries-in-esc-by-year.json -> ../import/countries-in-esc-by-year.json"
 
 
@@ -9 +9 @@
 
 echo "Generating Song (titles) problem list: problem-songs.html"
-./DBPEDIA-LOD-SPARQL-QUERY.sh problem-songs.sparql  html
+./DBPEDIA-LOD-SPARQL-QUERY.sh problem-lod-lists/dbpedia-problem-songs.sparql html
 
 echo "Generating Entrant (artists) problem list: problem-entrants.html"
-./DBPEDIA-LOD-SPARQL-QUERY.sh problem-entrants.sparql  html
+./DBPEDIA-LOD-SPARQL-QUERY.sh problem-lod-lists/dbpedia-problem-entrants.sparql html
 
 
-echo "Generating *combined* Song and Entrant problem list: problem-songs-and-entrants.html"
-./DBPEDIA-LOD-SPARQL-QUERY.sh problem-songs-and-entrants.sparql  html
+#echo "Generating *combined* Song and Entrant problem list: problem-songs-and-entrants.html"
+#./DBPEDIA-LOD-SPARQL-QUERY.sh problem-songs-and-entrants.sparql  html
 
 
-echo "Generating *return path* Song and Entrant problem list: problem-return-path-songs-and-entrants.html"
-./DBPEDIA-LOD-SPARQL-QUERY.sh problem-return-path-songs-and-entrants.sparql  html
+#echo "Generating *return path* Song and Entrant problem list: problem-return-path-songs-and-entrants.html"
+#./DBPEDIA-LOD-SPARQL-QUERY.sh problem-return-path-songs-and-entrants.sparql  html
 
 echo ""

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/DBPEDIA-LOD-SPARQL-QUERY.sh

@@ -24 +24 @@
 
 sparql_url="https://dbpedia.demo.openlinksw.com/sparql/"
-# sparql_url="https://dbpedia.org/sparql"
+#sparql_url="https://dbpedia.org/sparql"
 
 graph_arg="default-graph-uri=http%3A%2F%2Fdbpedia.org"
-
-#query_arg_safe='query=SELECT+%3Fcountries_in_esc_by_year+%3Fcountry_in_year+%3Fyear+%3Fcountry+%3Fentrant+%3Fsong%0D%0AWHERE+{%0D%0A+%3Fcountries_in_esc_by_year+skos%3Abroader+dbc%3ACountries_in_the_Eurovision_Song_Contest_by_year.%0D%0A%0D%0A+%3Fcountry_in_year+dct%3Asubject+%3Fcountries_in_esc_by_year.%0D%0A+bind(+REPLACE(str(%3Fcountry_in_year)%2C+".*(\\d{4})"%2C+"%241")+as+%3Fyear).%0D%0A+++FILTER+(+xsd%3Ainteger(%3Fyear)+<+2020).%0D%0A%0D%0A+%3Fcountry_in_year+dbp%3Acountry+%3Fcountry.%0D%0A+%3Fcountry_in_year+dbp%3Aentrant+%3Fentrant.%0D%0A%0D%0A+%3Fcountry_in_year+dbp%3Asong+%3Fsong.%0D%0A%23+%3Fsong+rdfs%3Alabel+%3Fsong_label%0D%0A%23+++FILTER+(lang(%3Fsong_label)+%3D+"en").%0D%0A%0D%0A%0D%0A}%0D%0AORDER+BY+DESC(%3Fcountries_in_esc_by_year)'
-#echo "query arg safe ="
-#echo $query_arg_safe
 
 
@@ -40 +36 @@
 additional_args="$output_format_arg_safe&timeout=30000&signal_void=on&signal_unconnected=on"
 
+tmp_table_filename="/tmp/table-sparql-result--$$.$output_ext"
 
-wget --no-check-certificate -O "table-$output_result_file" "$sparql_url?$graph_arg&$query_arg_safe&$additional_args"
+#wget --no-check-certificate -O "table-$output_result_file" "$sparql_url?$graph_arg&$query_arg_safe&$additional_args"
+wget --no-check-certificate -O "$tmp_table_filename" "$sparql_url?$graph_arg&$query_arg_safe&$additional_args"
 
-cat html-table-header.html "table-$output_result_file"  html-table-footer.html > "$output_result_file"
+cat html-table-header.html "$tmp_table_filename"  html-table-footer.html > "$output_result_file"
 
+if [ $? = 0 ] ; then
+    /bin/rm "$tmp_table_filename"
+else
+    echo "Failed to concatenate header+table+footer to create: $output_result_file" 1>&2
+    echo "Leaving temporaryly generated table file for inspection: $tmp_table_filename" 1>&2
+fi
+