Keep queryString variable name for the new queryV13 translation

Author: BouzelatTarek

dev-page/scripts/init.js

@@ -50,21 +50,21 @@ sparnatural.addEventListener("queryUpdated", (event) => {
 });
 
 sparnatural.addEventListener("queryUpdated", (event) => {
+  var queryStringOld = sparnatural.expandSparql(event.detail.queryStringOld);
   var queryString = sparnatural.expandSparql(event.detail.queryString);
-  var queryStringV13 = sparnatural.expandSparql(event.detail.queryStringV13);
   // Ajouter une ligne au tableau
   const tableBody = document.getElementById("sparql-comparison-table");
   const row = document.createElement("tr");
   const oldCell = document.createElement("td");
-  oldCell.textContent = queryString;
+  oldCell.textContent = queryStringOld;
   row.appendChild(oldCell);
   const newCell = document.createElement("td");
-  newCell.textContent = queryStringV13;
+  newCell.textContent = queryString;
   row.appendChild(newCell);
   const statusCell = document.createElement("td");
-  statusCell.textContent = queryString === queryStringV13 ? "OK" : "Pas OK";
+  statusCell.textContent = queryStringOld === queryString ? "OK" : "Pas OK";
   statusCell.classList.add(
-    queryString === queryStringV13 ? "table-success" : "table-danger"
+    queryStringOld === queryString ? "table-success" : "table-danger"
   );
   row.appendChild(statusCell);
   tableBody.appendChild(row);

src/sparnatural/statehandling/actions/GenerateQuery.ts

@@ -69,11 +69,11 @@ export class QueryGenerator {
     let selectQueryFromJson = sparqlFromJsonGenerator.generateQuery(jsonQuery);
 
     var generator = new Generator();
-    var queryString = generator.stringify(selectQueryFromJson);
+    var queryStringOld = generator.stringify(selectQueryFromJson);
 
     if (settings.debug) {
       console.log("*** Sparnatural SPARQL Query from JSON ***");
-      console.dir(queryString);
+      console.dir(queryStringOld);
     }
 
     // --------------------------------------------------------------
@@ -88,7 +88,7 @@ export class QueryGenerator {
       sparqlFromJsonV13Generator.generateQuery(jsonQueryV13);
 
     var generatorV13 = new Generator();
-    var queryStringV13 = generatorV13.stringify(selectQueryFromJsonV13);
+    var queryString = generatorV13.stringify(selectQueryFromJsonV13);
 
     //console.log("Generated SPARQL v13 Query:", queryStringV13);
 
@@ -97,7 +97,7 @@ export class QueryGenerator {
     // fire the event
     let payload: QueryUpdatedPayload = {
       queryString: queryString,
-      queryStringV13: queryStringV13,
+      queryStringOld: queryStringOld,
       queryJson: jsonQuery,
       newQueryJson: jsonQueryV13,
       querySparqlJs: selectQueryFromJson,
@@ -122,7 +122,7 @@ export class QueryGenerator {
 
 export class QueryUpdatedPayload {
   queryString: string;
-  queryStringV13: string;
+  queryStringOld: string;
   queryJson: SparnaturalQueryIfc;
   newQueryJson: SparnaturalQuery;
   querySparqlJs: Object;