diff --git a/Frontend/assets/css/tools/r11form.css b/Frontend/assets/css/tools/r11form.css
index 6eb8ab9..e54e151 100644
--- a/Frontend/assets/css/tools/r11form.css
+++ b/Frontend/assets/css/tools/r11form.css
@@ -330,6 +330,10 @@
height: 300px;
}
+.textarea-800 {
+ height: 800px;
+}
+
.centered-content {
display: flex;
justify-content: center;
diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js
index d44f732..d464330 100644
--- a/Frontend/assets/scripts/tools/scripts.js
+++ b/Frontend/assets/scripts/tools/scripts.js
@@ -96,22 +96,38 @@ function refreshTooltip() {
document.getElementById("xsltelementsheader").innerText = XSLTheader;
}
+
+
function performRequest(endpoint, checkXML, checkTransform){
- var xmlData = document.getElementById("xmlArea").value.trim();
- var transformData = document.getElementById("transformArea").value.trim();
+ var xmlData = document.getElementById(sourceId).value.trim();
+ var transformData = document.getElementById(targetId).value.trim();
+ var port = 8081
+ if (getProcessor() == "libxml") {
+ port = 8082
+ }
+
var empty = false;
if (defaultStrings.includes(xmlData) && checkXML) {
- document.getElementById("xmlArea").style.backgroundColor = color_red;
+ document.getElementById(sourceId).style.backgroundColor = color_red;
xmlData = "";
empty = true;
}
if (defaultStrings.includes(transformData) && checkTransform) {
- document.getElementById("transformArea").style.backgroundColor = color_red;
+ document.getElementById(targetId).style.backgroundColor = color_red;
empty = true;
}
if (!empty) {
- restRequest(endpoint, xmlData, transformData);
+ restRequest(port, endpoint, xmlData, transformData).then(function(result) {
+ document.getElementById("resultArea").value = result.result;
+ document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor);
+ if (result.status = "OK") {
+ document.getElementById("procinfo").innerText = document.getElementById("procinfo").innerText.concat(" in ", result.time, "ms");
+ procinfo.style.color = "#30aa58";
+ } else {
+ procinfo.style.color = "#aa3030";
+ }
+ });
}else{
document.getElementById("resultArea").value = "No data provided!";
return false;
@@ -119,33 +135,35 @@ function performRequest(endpoint, checkXML, checkTransform){
}
-function performFormatRequest(endpoint, checkXML){
- var xmlData = document.getElementById("xmlArea").value.trim();
+function performFormatRequest(endpoint, checkXML, sourceId, targetId){
+ const port = 8082;
+ var xmlData = document.getElementById(sourceId).value.trim();
var empty = false;
if (defaultStrings.includes(xmlData) && checkXML) {
- document.getElementById("xmlArea").style.backgroundColor = color_red;
+ document.getElementById(sourceId).style.backgroundColor = color_red;
xmlData = "";
empty = true;
}
+
if (!empty) {
- restRequest(endpoint, xmlData, null);
+ restRequest(port, endpoint, xmlData, "").then(function(result) {
+ document.getElementById(targetId).value = result.result;
+
+ });
}else{
- document.getElementById("resultArea").value = "No data provided!";
+ document.getElementById(targetId).value = "No data provided!";
return false;
}
}
-//Form REST request, send, receive and display in resultArea
-async function restRequest(endpoint, xmlData, transformData) {
+//Form REST request, send and return received data
+async function restRequest(port, endpoint, xmlData, transformData) {
const escapeChar = "specialEscapeChar";
- var port = ":8081/"
- if (getProcessor() == "libxml") {
- port = ":8082/"
- }
- const addr = window.location.protocol + "//" + window.location.hostname + port + endpoint;
+
+ const addr = window.location.protocol + "//" + window.location.hostname + ":" + port + "/" + endpoint;
if(defaultStrings.includes(xmlData)){
xmlData = "
+ onclick="performFormatRequest('prettifypost', true, 'xmlArea', 'xmlArea')">Prettify XML
-
-
-
-
-
+ onclick="performFormatRequest('minimizepost', true, 'xmlArea', 'xmlArea')">Minimize XML
+