Skip to content

Commit

Permalink
explicity pass textclass, but only when it actually exists, fixes an …
Browse files Browse the repository at this point in the history 
…earlier attempt #173
  • Loading branch information
@proycon
proycon committed Jul 1, 2021
1 parent 9b2afc2 commit 1ce34dd
Showing 1 changed file with 18 additions and 9 deletions.
27 changes: 18 additions & 9 deletions flat/script/flat.editor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1951,12 +1951,14 @@ function build_queries(addtoqueue) {
if (editdata[i].insertright) { //APPEND (insertion)
query += " " + editdata[i].insertright_type;
if ((editdata[i].type == "t") && (editdata[i].insertright !== "")) {
query += " WITH text \"" + escape_fql_value(editdata[i].insertright) + "\" textclass \"" + escape_fql_value(editdata[i].textclass) + "\" datetime now confidence " + editdata[i].confidence;
query += " WITH text \"" + escape_fql_value(editdata[i].insertright) + "\" datetime now confidence " + editdata[i].confidence;
if (editdata[i].textclass) query += " textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
}
} else if (editdata[i].insertleft) { //PREPEND (insertion)
query += " " + editdata[i].insertleft_type;
if ((editdata[i].type == "t") && (editdata[i].insertleft !== "")) {
query += " WITH text \"" + escape_fql_value(editdata[i].insertleft) + "\" textclass \"" + escape_fql_value(editdata[i].textclass) + "\" datetime now confidence " + editdata[i].confidence;
query += " WITH text \"" + escape_fql_value(editdata[i].insertleft) + "\" datetime now confidence " + editdata[i].confidence;
if (editdata[i].textclass) query += " textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
}
} else { //normal behaviour
query += " " +editdata[i].type;
Expand All @@ -1966,33 +1968,40 @@ function build_queries(addtoqueue) {
query += " OF " + editdata[i].set;
}
if ((editdata[i].type == "t") && (editdata[i].text !== "")) {
query += " WITH text \"" + escape_fql_value(editdata[i].text) + "\" textclass \"" + escape_fql_value(editdata[i].textclass) + "\" datetime now confidence " + editdata[i].confidence;
query += " WITH text \"" + escape_fql_value(editdata[i].text) + "\" datetime now confidence " + editdata[i].confidence;
if (editdata[i].textclass) query += " textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
} else if ((editdata[i].type == "ph") && (editdata[i].text !== "")) {
query += " WITH phon \"" + escape_fql_value(editdata[i].text) + "\" textclass \"" + escape_fql_value(editdata[i].textclass) + "\" datetime now confidence " + editdata[i].confidence;
query += " WITH phon \"" + escape_fql_value(editdata[i].text) + "\" datetime now confidence " + editdata[i].confidence;
if (editdata[i].textclass) query += " textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
} else if (editdata[i].class !== "") {
//no deletion
query += " WITH class \"" + escape_fql_value(editdata[i].class) + "\" textclass \"" + escape_fql_value(editdata[i].textclass) + "\" datetime now confidence " + editdata[i].confidence;
query += " WITH class \"" + escape_fql_value(editdata[i].class) + "\" datetime now confidence " + editdata[i].confidence;
if (editdata[i].textclass) query += " textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
}
}
} else { //substitute
if (editdata[i].insertright) { //insertright as substitute
query += "SUBSTITUTE w";
if ((editdata[i].type == "t") && (editdata[i].insertright !== "")) {
query += " WITH text \"" + escape_fql_value(editdata[i].insertright) + "\" textclass \"" + escape_fql_value(editdata[i].textclass) + "\" datetime now confidence " + editdata[i].confidence;
query += " WITH text \"" + escape_fql_value(editdata[i].insertright) + "\" datetime now confidence " + editdata[i].confidence;
if (editdata[i].textclass) query += " textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
}
} else if (editdata[i].insertleft) { //insertleft as substitute
query += "SUBSTITUTE w";
if ((editdata[i].type == "t") && (editdata[i].insertleft !== "")) {
query += " WITH text \"" + escape_fql_value(editdata[i].insertleft) + "\" textclass \"" + escape_fql_value(editdata[i].textclass) + "\" datetime now confidence " + editdata[i].confidence;
query += " WITH text \"" + escape_fql_value(editdata[i].insertleft) + "\" datetime now confidence " + editdata[i].confidence;
if (editdata[i].textclass) query += " textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
}
} if (editdata[i].dosplit) {
parts = editdata[i].text.split(" ");
for (var j = 0; j < parts.length; j++) { //SPLIT
if (j > 0) query += " ";
query += "SUBSTITUTE w WITH text \"" + escape_fql_value(parts[j]) + "\" textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
query += "SUBSTITUTE w WITH text \"" + escape_fql_value(parts[j]) + "\"";
if (editdata[i].textclass) query += " textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
}
} else if (editdata[i].targets.length > 1) { //MERGE
query += "SUBSTITUTE w WITH text \"" + escape_fql_value(editdata[i].text) + "\" textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
query += "SUBSTITUTE w WITH text \"" + escape_fql_value(editdata[i].text) + "\"";
if (editdata[i].textclass) query += " textclass \"" + escape_fql_value(editdata[i].textclass) + "\"";
}
}
if ((editdata[i].respan) && (action != "SUBSTITUTE")) { //isspan && editdata[i].id && (action == "EDIT")) {
Expand Down

0 comments on commit 1ce34dd

Please sign in to comment.