From 4f593ae28d48f969e78f5849c44edf13bbafda6c Mon Sep 17 00:00:00 2001 From: Egon Willighagen Date: Sat, 22 Jun 2024 21:08:01 +0200 Subject: [PATCH] Cannot overload, so second function name --- scholia/app/static/scholia.js | 16 ++++++++-------- scholia/app/templates/base.html | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scholia/app/static/scholia.js b/scholia/app/static/scholia.js index a4fce7b2..f560e431 100644 --- a/scholia/app/static/scholia.js +++ b/scholia/app/static/scholia.js @@ -208,7 +208,7 @@ function addReloadButton(element, callback) { } } -function sparqlToResponse(endpointUrl, sparql, doneCallback) { +function sparqlToResponse2(endpointUrl, sparql, doneCallback) { var settings = { headers: { Accept: "application/sparql-results+json" }, data: { query: sparql }, @@ -218,7 +218,7 @@ function sparqlToResponse(endpointUrl, sparql, doneCallback) { function sparqlToResponse(sparql, doneCallback) { - return sparqlToResponse( + return sparqlToResponse2( "https://query.wikidata.org/bigdata/namespace/wdq/sparql", sparql, doneCallback ); @@ -242,7 +242,7 @@ function sparqlDataToSimpleData(response) { function sparqlToDataTablePost(sparql, element, filename, options = {}) { - sparqlToDataTablePost( + sparqlToDataTablePost2( "https://query.wikidata.org/sparql", "https://query.wikidata.org/", sparql, element, filename, options @@ -250,7 +250,7 @@ function sparqlToDataTablePost(sparql, element, filename, options = {}) { } -function sparqlToDataTablePost(url, editURL, sparql, element, filename, options = {}) { +function sparqlToDataTablePost2(url, editURL, sparql, element, filename, options = {}) { // Options: paging= if (!url) url = "https://query.wikidata.org/sparql"; if (!editURL) editURL = "https://query.wikidata.org/"; @@ -304,7 +304,7 @@ function sparqlToDataTablePost(url, editURL, sparql, element, filename, options function sparqlToDataTable(sparql, element, filename, options = {}) { - sparqlToDataTablePost( + sparqlToDataTablePost2( "https://query.wikidata.org/sparql", "https://query.wikidata.org/", sparql, element, filename, options @@ -312,7 +312,7 @@ function sparqlToDataTable(sparql, element, filename, options = {}) { } -function sparqlToDataTable(url, editURL, sparql, element, filename, options = {}) { +function sparqlToDataTable2(url, editURL, sparql, element, filename, options = {}) { // Options: paging=true if (!url) url = "https://query.wikidata.org/sparql"; if (!editURL) editURL = "https://query.wikidata.org/"; @@ -443,7 +443,7 @@ function sparqlToDataTable(url, editURL, sparql, element, filename, options = {} function sparqlToIframe(sparql, element, filename) { - sparqlToIframe( + sparqlToIframe2( "https://query.wikidata.org/sparql", "https://query.wikidata.org/", "https://query.wikidata.org/embed.html#", @@ -452,7 +452,7 @@ function sparqlToIframe(sparql, element, filename) { } -function sparqlToIframe(url, editURL, embedURL, sparql, element, filename) { +function sparqlToIframe2(url, editURL, embedURL, sparql, element, filename) { let $iframe = $(element); if (!url) url = "https://query.wikidata.org/sparql"; if (!editURL) editURL = "https://query.wikidata.org/"; diff --git a/scholia/app/templates/base.html b/scholia/app/templates/base.html index fa2aa721..3007b14e 100644 --- a/scholia/app/templates/base.html +++ b/scholia/app/templates/base.html @@ -2,7 +2,7 @@ {% macro sparql_to_table_post(panel, options={}) -%} // {{ panel }} table -sparqlToDataTablePost("{{ sparql_endpoint }}", "{{ sparql_editURL }}", +sparqlToDataTablePost2("{{ sparql_endpoint }}", "{{ sparql_editURL }}", `# tool: scholia {% include aspect + '_' + panel + '.sparql' %} `, @@ -12,7 +12,7 @@ {% macro sparql_to_table(panel, options={}) -%} // {{ panel }} table -sparqlToDataTable("{{ sparql_endpoint }}", "{{ sparql_editURL }}", +sparqlToDataTable2("{{ sparql_endpoint }}", "{{ sparql_editURL }}", `# tool: scholia {% include aspect + '_' + panel + '.sparql' %} `, @@ -22,7 +22,7 @@ {% macro sparql_to_iframe(panel) -%} // {{ panel }} iframe -sparqlToIframe("{{ sparql_endpoint }}", "{{ sparql_editURL }}", +sparqlToIframe2("{{ sparql_endpoint }}", "{{ sparql_editURL }}", "{{ sparql_embedURL }}", `# tool: scholia {% include aspect + '_' + panel + '.sparql' %}`, "#{{ panel }}-iframe", "{{ aspect }}_{{ panel }}.sparql");