Merge remote-tracking branch 'origin/Add_xslt_parameters' into Add_xslt_parameters

# Conflicts:
#	Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java
#	Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XmlJobType.java
#	Backend/tools-services/src/main/java/com/r11/tools/xml/XmlEngine.java

Backend-libXML/Parser.py

@@ -40,20 +40,17 @@ def formatXML(source: str, prettify: bool) -> str:
     if prolog_start != -1:
         prolog_end = source.find("?>") + 2
         prolog = source[prolog_start:prolog_end]
-        source = source[prolog_end:].strip()
-
+        source = source[prolog_end: ]
+    
     byte_input = BytesIO(source.encode("utf-8"))
     parser = etree.XMLParser(remove_blank_text=True)
     xml = etree.parse(byte_input, parser=parser)
 
     if prettify:
         prolog += "\n"
-        return prolog + etree.tostring(xml, pretty_print=True, encoding="utf-8").decode("utf-8")
 
-    raw_xml = etree.tostring(xml, encoding="utf-8").decode("utf-8")
-    raw_xml = " ".join(raw_xml.split())
+    return prolog + etree.tostring(xml, pretty_print=prettify).decode()
 
-    return prolog + raw_xml
 
 def xpath(source: str, xpath: str) -> str:
     """
@@ -86,6 +83,7 @@ def xpath(source: str, xpath: str) -> str:
         return result_string, "node"
 
 
+
 def xsd(source: str, xsd: str) -> bool:
     """
     Method used to validate XML string against XSD schema
@@ -106,6 +104,8 @@ def xsd(source: str, xsd: str) -> bool:
     except etree.DocumentInvalid as e:
         return str(e)
 
+    
+    
 def xslt(source: str, xslt: str) -> str:
     """
     Method used to transform XML string using XSLT

Backend-libXML/main.py

@@ -36,8 +36,8 @@ def process_xml(request: request, type: str) -> str:
             response_json['result'] = Parser.xslt(data, processorData)
         elif (type == "xpath"):
             response_json['result'], response_json['type'] = Parser.xpath(data, processorData)
-        # elif (type == "prettify"):
-        #     response_json['result'] = Parser.formatXML(data, True)
+        elif (type == "prettify"):
+            response_json['result'] = Parser.formatXML(data, True)
         elif (type == "minimize"):
             response_json['result'] = Parser.formatXML(data, False)
         elif (type == "prettifyHtml"):
@@ -77,10 +77,9 @@ def xsd():
 def xslt():
     return process_xml(request, "xslt")
 
-# Removed because lxml can't pretify <xs:complexType mixed="true">
-# @app.route("/prettify", methods=["POST"])
-# def prettify():
-#     return process_xml(request, "prettify")
+@app.route("/prettify", methods=["POST"])
+def prettify():
+    return process_xml(request, "prettify")
 
 @app.route("/minimize", methods=["POST"])
 def minimize():

Backend/tools-services/src/main/java/com/r11/tools/SparkApplication.java

@@ -44,7 +44,6 @@ public class SparkApplication {
         registry.registerController(new XmlController(gson, logger, saxon, xalan));
         registry.registerController(new MultipleXMLController(gson,logger, saxon));
         registry.registerController(new JsonController(gson, jsongson, logger));
-        registry.registerController(new XmlFormatterController(gson));
 
         registry.register();
 

Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java

@@ -10,6 +10,8 @@ import org.apache.logging.log4j.Logger;
 import spark.Request;
 import spark.Response;
 
+import java.io.StringWriter;
+
 /**
  * Controller used to handle XML tools: XPath, XSD validation, XQuery and XSLT
  * @author Adam Bem
@@ -48,9 +50,14 @@ public class XmlController implements RestController {
 
     @ScopedControllerManifest(method = HandlerType.POST, path = "/xslt")
     public void acceptRequestXslt(Request request, Response response) {
+        System.out.println("received xslt");
         acceptRequest(request, response, XmlJobType.XSLT);
     }
-
+    @ScopedControllerManifest(method = HandlerType.POST, path = "/xslt/param")
+    public void acceptRequestXsltAddParam(Request request, Response response) {
+        System.out.println("received param");
+        acceptRequest(request, response, XmlJobType.XSLT_PARAM);
+    }
     private void acceptRequest(Request request, Response response, XmlJobType xmlJobType) {
         XMLRequestBody requestBody;
         try {
@@ -60,7 +67,12 @@ public class XmlController implements RestController {
             return;
         }
 
-        if (requestBody.getProcessor() == null) {
+        if (requestBody.getProcessor() == null ) {
+            if(requestBody.getProcessorData() != null){
+                processRequest(new XmlJob(response, requestBody, xmlJobType));
+                return;
+            }
+            System.out.println("getProcessor=null");
             invalidEngineSelectedResponse(response);
             return;
         }
@@ -91,10 +103,9 @@ public class XmlController implements RestController {
             responseBody.setDuration(duration);
 
             xmlJob.getResponse().status(200);
-
-            this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
+           /* this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
                     xmlJob.getEngine().getVersion() +
-                    ") processed in " + duration + " ms.");
+                    ") processed in " + duration + " ms.");*/
 
         } catch (Exception ex) {
             responseBody = processingErrorResponse(ex, xmlJob);
@@ -129,6 +140,13 @@ public class XmlController implements RestController {
 
         String result = null;
         switch (xmlJob.getXmlJobType()) {
+            case XSLT_PARAM:
+                System.out.println("xstl_param");
+                System.out.println(requestBody.getProcessorData());
+                System.out.println(requestBody.getParamName());
+                System.out.println(requestBody.getParamValue());
+                result = addParam(requestBody.getProcessorData(), requestBody.getParamName(), requestBody.getParamValue());
+                break;
             case XSLT:
                 result = engine.processXSLT(requestBody.getData(), requestBody.getProcessorData());
                 break;
@@ -141,7 +159,16 @@ public class XmlController implements RestController {
                         requestBody.getVersion());
                 break;
         }
-        return new XMLResponseBody(result, "OK", requestBody.getVersion());
+        System.out.println("can we get here?");
+        return new XMLResponseBody(result, "OK", requestBody.getProcessorData());
+    }
+
+    private String addParam(String processorData, String paramName, String paramValue) {
+        System.out.println("addParamSaxon");
+        processorData= processorData.replace("<xsl:template match=\"/\">", "<xsl:param name=\""+paramName+"\" select=\"'"+paramValue+"'\"/>\n\t\t<xsl:template match=\"/\">");
+        StringWriter sw = new StringWriter();
+        sw.write(processorData);
+        return sw.toString();
     }
 
     private XMLResponseBody processingErrorResponse(Exception ex, XmlJob xmlJob) {

Backend/tools-services/src/main/java/com/r11/tools/controller/XmlFormatterController.java

@@ -1,51 +0,0 @@
-package com.r11.tools.controller;
-
-import com.google.gson.Gson;
-import com.r11.tools.controller.internal.GlobalControllerManifest;
-import com.r11.tools.controller.internal.HandlerType;
-import com.r11.tools.controller.internal.RestController;
-import com.r11.tools.controller.internal.ScopedControllerManifest;
-import com.r11.tools.controller.internal.XmlJobType;
-import com.r11.tools.model.XMLRequestBody;
-import com.r11.tools.model.XMLResponseBody;
-import com.r11.tools.xml.XmlFormatter;
-import spark.Request;
-import spark.Response;
-
-@GlobalControllerManifest
-public class XmlFormatterController implements RestController {
-    private final Gson gson;
-
-    public XmlFormatterController(Gson gson) {
-        this.gson = gson;
-    }
-
-
-    @ScopedControllerManifest(method = HandlerType.POST, path = "/prettify")
-    public void acceptRequestXslt(Request request, Response response) {
-        acceptRequest(request, response);
-    }
-    private void acceptRequest(Request request, Response response){
-        long timeStart = System.currentTimeMillis();
-        long duration;
-
-        XmlFormatter formatter = new XmlFormatter();
-        XMLRequestBody requestBody;
-        try {
-            requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);
-        } catch (Exception e) {
-            requestErrorResponse(response, e);
-            return;
-        }
-        String responseString = formatter.formatXML(requestBody.getData());
-        duration = System.currentTimeMillis() - timeStart;
-        XMLResponseBody responseBody = new  XMLResponseBody(responseString,"OK",duration);
-        response.body(this.gson.toJson(responseBody));
-
-    }
-    private void requestErrorResponse(Response response, Exception ex) {
-        XMLResponseBody responseBody = new XMLResponseBody(ex.getMessage(), "ERR", "N/A", -1);
-        response.status(400);
-        response.body(this.gson.toJson(responseBody));
-    }
-}

Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XmlJob.java

@@ -7,7 +7,7 @@ import spark.Response;
 public class XmlJob {
     private final Response response;
     private final XMLRequestBody requestBody;
-    private final XmlEngine engine;
+    private XmlEngine engine;
     private final XmlJobType xmlJobType;
 
     public XmlJob(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) {
@@ -16,7 +16,11 @@ public class XmlJob {
         this.engine = engine;
         this.xmlJobType = xmlJobType;
     }
-
+    public XmlJob(Response response, XMLRequestBody requestBody, XmlJobType xmlJobType) {
+        this.response = response;
+        this.requestBody = requestBody;
+        this.xmlJobType = xmlJobType;
+    }
     public Response getResponse() {
         return response;
     }

Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XmlJobType.java

@@ -1,7 +1,7 @@
 package com.r11.tools.controller.internal;
 
 public enum XmlJobType {
-    XPath("XPath"), XSD("XSD"), XQuery("XQuery"), XSLT("XSLT");
+    XPath("XPath"), XSD("XSD"), XQuery("XQuery"), XSLT("XSLT"), XSLT_PARAM("XSLT_PARAM");
 
     XmlJobType(String type) {
     }

Backend/tools-services/src/main/java/com/r11/tools/model/XMLRequestBody.java

@@ -4,7 +4,6 @@ import com.google.gson.annotations.SerializedName;
 
 /**
  * POJO class used to contain body of XML related requests
- *
  * @author Adam Bem
  */
 public class XMLRequestBody {
@@ -16,26 +15,21 @@ public class XMLRequestBody {
     private String processor;
     @SerializedName("version")
     private String version;
-    @SerializedName("pretify")
-    private String pretif;
+    @SerializedName("paramName")
+    private String paramName;
+    @SerializedName("paramValue")
+    private String paramValue;
 
     public String getData() {
         return data;
     }
-
-    public String getProcessorData() {
-        return processorData;
-    }
-
+    public String getProcessorData() {return processorData;}
+    public String getParamName() {return paramName;}
+    public String getParamValue() {return paramValue;}
     public String getProcessor() {
         return processor;
     }
-
     public String getVersion() {
         return version;
     }
-
-    public String getPretif() {
-        return pretif;
-    }
 }

Backend/tools-services/src/main/java/com/r11/tools/model/XMLResponseBody.java

@@ -2,7 +2,6 @@ package com.r11.tools.model;
 
 public class XMLResponseBody {
 
-
     private String result;
     private String status;
     private String processor;
@@ -11,11 +10,6 @@ public class XMLResponseBody {
     // Optional
     private String type;
 
-    public XMLResponseBody(String result, String status, long duration) {
-        this.result = result;
-        this.status = status;
-        this.duration = duration;
-    }
     public XMLResponseBody(String result, String status, String processor) {
         this.result = result;
         this.status = status;

Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java

@@ -164,4 +164,9 @@ public class Saxon implements XmlEngine{
     public String getVersion() {
         return "Saxon " + new Processor(false).getSaxonProductVersion();
     }
+
+    @Override
+    public String addParam(String data, String processorData) throws Exception {
+        return null;
+    }
 }

Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java

@@ -124,6 +124,11 @@ public class Xalan implements XmlEngine{
         return org.apache.xalan.Version.getVersion();
     }
 
+    @Override
+    public String addParam(String data, String processorData) throws Exception {
+        return null;
+    }
+
     /**
      * Validates string representation of the xml document against xsd schema
      * @param data xml document

Backend/tools-services/src/main/java/com/r11/tools/xml/XmlEngine.java

@@ -9,9 +9,7 @@ public interface XmlEngine {
     XPathQueryResult processXPath(String data, String query, String version) throws Exception;
     String processXSLT(String data, String transform) throws Exception;
     String validate(String data, String xsd) throws Exception;
-
     String executeXQuery(String data, String xquery, String version) throws Exception;
-
     public String getVersion();
-
+    String addParam(String processorData, String paramName, String paramValue) throws Exception;
 }

Backend/tools-services/src/main/java/com/r11/tools/xml/XmlFormatter.java

@@ -1,37 +0,0 @@
-package com.r11.tools.xml;
-
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-public class XmlFormatter {
-    public String formatXML(String inputXML) {
-        try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            factory.setNamespaceAware(true);
-            DocumentBuilder builder = factory.newDocumentBuilder();
-            Document document = builder.parse(new InputSource(new StringReader(inputXML)));
-
-            TransformerFactory transformerFactory = TransformerFactory.newInstance();
-            Transformer transformer = transformerFactory.newTransformer();
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-
-            StringWriter writer = new StringWriter();
-            transformer.transform(new DOMSource(document), new StreamResult(writer));
-            return writer.toString();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-}

Frontend/src/components/XsltParamComponent.vue

@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import {defineComponent, ref} from 'vue'
+const selected = ref('A')
+
+let options = ref([
+  { text: 'One', value: 'A' },
+  { text: 'Two', value: 'B' },
+  { text: 'Three', value: 'C' }
+])
+</script>
+
+<template>
+  <select v-model="selected" class="px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-2/3" >
+    <option v-for="option in options" :value="option.value">
+      {{ option.text }}
+    </option>
+  </select>
+
+  <input
+      id="textInput1"
+      class="text-input px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-1/3"
+      type="text"
+      placeholder="Name"
+  />
+  <input
+      id="textInput2"
+      class="text-input px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-1/3"
+      type="text"
+      placeholder="Value"
+  />
+  <button class="tool-button" @click="clear">Add Variable</button>
+</template>
+

Frontend/src/components/formatter/XMLButtonFormatterComponent.vue

@@ -18,37 +18,38 @@ function process() {
 }
 
 function prepareRequest():Request {
-  return new Request(prepareURL(), {
-      body: prepareRequestBody(),
-      method: "POST"
+    var request = new Request(prepareURL(), {
+        body: prepareRequestBody(),
+        method: "POST"
     })
+    return request
 }
 
 function prepareURL(): string {
-  let mode = "/java/prettify";
-  console.log("prepareUrl")
-  console.log(props.isMinimizer)
-  if (props.isMinimizer)
-        mode = "/libxml/minimize"
-    return document.location.protocol + "//" + document.location.hostname + mode
+    var mode = "prettify"
+    if (props.isMinimizer)
+        mode = "minimize"
+    return document.location.protocol + "//" + document.location.hostname + "/libxml/" + mode
 }
 
 function prepareRequestBody():string {
-  return JSON.stringify({
-      "data": props.xml,
-      "processorData": "N/A",
-      "processor": "libxml",
-      "version": "1.0"
+    var requestBody = JSON.stringify({
+        "data": props.xml,
+        "processorData": "N/A",
+        "processor": "libxml",
+        "version": "1.0"
     })
+    return requestBody
 }
 
 async function fetchRequest(request: Request):Promise<JSON> {
-  return await fetch(request)
-        .then(response => response.json())
-        .then((body) => {
-          emit("update:error", body.status == "ERR")
-          return body
-        })
+    var responseBody = await fetch(request)
+    .then(response => response.json())
+    .then((body) => {
+        emit("update:error", body.status == "ERR")
+        return body
+    })
+    return responseBody
 }
 
 function sendProcessedData(data: JSON) {

Frontend/src/components/xml/XmlInputFieldComponent.vue

@@ -2,13 +2,14 @@
 import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue'
 import XMLButtonFormatterComponent from '@components/formatter/XMLButtonFormatterComponent.vue'
 import CodeEditor from '@/components/common/CodeEditorComponent.vue'
+import XsltParamComponent from '@/components/XsltParamComponent.vue'
 
-import { ref } from 'vue'
+import {ref} from 'vue'
 
 const props = defineProps(
     {
-        stylizedName: {type: String, required: true},
-        data: {type: String},
+      stylizedName: {type: String, required: true},
+      data: {type: String},
     }
 )
 const emit = defineEmits(['update:modelValue'])
@@ -17,54 +18,72 @@ const data = ref('')
 const inputFile = ref()
 
 function sendValue() {
-    emit('update:modelValue', data.value)
+  emit('update:modelValue', data.value)
 }
 
+
 function updateData(newData: string, clearFileSelector: boolean = true) {
-    data.value = newData
-    if (clearFileSelector)
-        inputFile.value.value = '';
-    sendValue()
+  data.value = newData
+  if (clearFileSelector)
+    inputFile.value.value = '';
+  sendValue()
 }
 
 function clear() {
-    updateData('')
+  updateData('')
 }
 
 function canBeFormatted() {
-    return props.stylizedName.toLowerCase() == 'xml' || 
-           props.stylizedName.toLowerCase() == 'xsd' || 
-           props.stylizedName.toLowerCase() == 'xslt'
+  return props.stylizedName.toLowerCase() == 'xml' ||
+      props.stylizedName.toLowerCase() == 'xsd' ||
+      props.stylizedName.toLowerCase() == 'xslt'
 }
 
-function readFile(file : any) {
-    
-    const reader = new FileReader()
-    reader.onloadend = () => {
-        let result = reader.result?.toString()
-        if (typeof result == "string")
-            updateData(result, false);
-            
-    }
-    reader.readAsText(file.target.files[0])
+function addParameters() {
+  return props.stylizedName?.toLowerCase() == "xslt"
 }
 
+function readFile(file: any) {
+
+  const reader = new FileReader()
+  reader.onloadend = () => {
+    let result = reader.result?.toString()
+    if (typeof result == "string")
+      updateData(result, false)
+
+  }
+  reader.readAsText(file.target.files[0])
+}
+
+
+
 </script>
 
 <template>
-    <div class="flex flex-col w-full h-1/2 lg:h-1/2 flex-none xl:pr-2 2xl:pr-4 pb-2">
-        <div class="flex place-content-between w-full items-center">
-            <span class="dark:text-white mr-2">{{ stylizedName }}</span>
-            <div class="flex space-x-2 pb-2 overflow-x-auto">
-                <div class="flex items-stretch w-64">
-                    <input id="fileLoader" ref="inputFile" class="file-selector" type="file" accept=".xml,.xql,.xquery,.xslt,text/xml,text/plain" @change="readFile" />
-                </div>
-                
-                <InsertTemplateComponent :stylized-name="props.stylizedName" @update:default-data="updateData"></InsertTemplateComponent>
-                <XMLButtonFormatterComponent v-if="canBeFormatted()" :xml="data" @update:result="(data:any) => updateData(data.result)"></XMLButtonFormatterComponent>
-                <button class="tool-button" @click="clear">Clear</button>
-            </div>
-        </div>
-        <CodeEditor @update:updated-code="updateData" v-model="data" :code="data" :config="{disabled:false, language:stylizedName}"></CodeEditor>
+  <div class="flex flex-col w-full h-1/2 lg:h-1/2 flex-none xl:pr-2 2xl:pr-4 pb-2">
+    <div class="flex justify-between mb-2"></div>
+
+    <div class="flex place-content-between w-full items-center">
+
+      <span class="dark:text-white mr-2">{{ stylizedName }}</span>
+
+      <div class="flex items-stretch w-64">
+        <input id="fileLoader" ref="inputFile" class="file-selector" type="file" accept=".xml,.xql,.xquery,.xslt,text/xml,text/plain" @change="readFile"/>
+      </div>
+
+      <div class="flex space-x-2 pb-2 overflow-x-auto">
+        <InsertTemplateComponent :stylized-name="props.stylizedName" @update:default-data="updateData"></InsertTemplateComponent>
+        <XMLButtonFormatterComponent v-if="canBeFormatted()" :xml="data" @update:result="(data:any) => updateData(data.result)"></XMLButtonFormatterComponent>
+        <button class="tool-button" @click="clear">Clear</button>
+      </div>
     </div>
+
+    <div class="flex place-content-between w-full items-center">
+      <div v-if="addParameters()" class="flex justify-end space-x-2 pb-2 overflow-x-auto ml-auto">
+        <XsltParamComponent :stylizedName="stylizedName"/>
+      </div>
+    </div>
+
+    <CodeEditor @update:updated-code="updateData" v-model="data" :code="data" :config="{disabled:false, language:stylizedName}"></CodeEditor>
+  </div>
 </template>