R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Changed process to processorData in app

Browse Source
This commit is contained in:
Adam Bem
2023-10-27 10:24:31 +02:00
parent 430b6de5f0
commit 87b9bfafc6
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,7 @@ public class XmlController implements RestController {
XMLRequestBody requestBody = xmlJob.getRequestBody();
XPathQueryResult xPathQueryResult =
engine.processXPath(requestBody.getData(), requestBody.getProcess(), requestBody.getVersion());
engine.processXPath(requestBody.getData(), requestBody.getProcessorData(), requestBody.getVersion());
return new XMLResponseBody(xPathQueryResult.getData().trim(),
"OK", engine.getVersion(), xPathQueryResult.getType());
@@ -130,14 +130,14 @@ public class XmlController implements RestController {
String result = null;
switch (xmlJob.getXmlJobType()) {
case XSLT:
result = engine.processXSLT(requestBody.getData(), requestBody.getProcess());
result = engine.processXSLT(requestBody.getData(), requestBody.getProcessorData());
break;
case XSD:
result = engine.validate(requestBody.getData(), requestBody.getProcess()).trim();
result = engine.validate(requestBody.getData(), requestBody.getProcessorData()).trim();
break;
case XQuery:
result = engine.executeXQuery(requestBody.getData(),
requestBody.getProcess(),
requestBody.getProcessorData(),
requestBody.getVersion());
break;
}

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

@@ -4,13 +4,13 @@ import com.google.gson.annotations.SerializedName;
/**
* POJO class used to contain body of XML related requests
* @author Adam
* @author Adam Bem
*/
public class XMLRequestBody {
@SerializedName("data")
private String data;
@SerializedName("process")
private String process;
@SerializedName("processorData")
private String processorData;
@SerializedName("processor")
private String processor;
@SerializedName("version")
@@ -20,8 +20,8 @@ public class XMLRequestBody {
return data;
}
public String getProcess() {
return process;
public String getProcessorData() {
return processorData;
}
public String getProcessor() {

2
Frontend/src/components/xml/XmlOutputFieldComponent.vue
View File

@@ -100,7 +100,7 @@ function prepareURL(): string {
function prepareRequestBody():string {
var requestBody = JSON.stringify({
"data": props.xml,
"process": props.query,
"processorData": props.query,
"processor": engine.value,
"version": version.value
});