Changeset 34944

Timestamp:

2021-03-01T22:49:17+13:00 (3 years ago)

Author:

davidb

Message:

Updated to only do header and footer for HTML output

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/DBPEDIA-LOD-SPARQL-QUERY.sh (modified) (1 diff)

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

@@ -36 +36 @@
 additional_args="$output_format_arg_safe&timeout=30000&signal_void=on&signal_unconnected=on"
 
-tmp_table_filename="/tmp/table-sparql-result--$$.$output_ext"
+tmp_output_ext_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 "$tmp_table_filename" "$sparql_url?$graph_arg&$query_arg_safe&$additional_args"
+wget --no-check-certificate -O "$tmp_output_ext_filename" "$sparql_url?$graph_arg&$query_arg_safe&$additional_args"
 
-cat html-table-header.html "$tmp_table_filename"  html-table-footer.html > "$output_result_file"
+echo "Generating: $output_result_file"
+if [ "$output_ext" = "html" ] ; then
+    cat html-table-header.html "$tmp_output_ext_filename"  html-table-footer.html > "$output_result_file"
 
-if [ $? = 0 ] ; then
-    /bin/rm "$tmp_table_filename"
+    if [ $? = 0 ] ; then
+    /bin/rm "$tmp_output_ext_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_output_ext_filename" 1>&2
+    fi
 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
+    /bin/cp "$tmp_output_ext_filename" "$output_result_file"
+    if [ $? = 0 ] ; then
+    /bin/rm "$tmp_output_ext_filename"
+    else
+    echo "Failed to generate: $output_result_file" 1>&2
+    echo "Leaving temporaryly generated output-ext file for inspection: $tmp_output_ext_filename" 1>&2
+    fi    
 fi