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

Solved #195 and cleaned up code #196

Merged
bema merged 4 commits from bema/fix/xalan_functions into master 2023-05-18 13:36:53 +02:00
Conversation 1 Commits 4 Files Changed 5 +62 -53
1 changed files with 62 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b405679d0 - Show all commits

75
Backend/tools-services/src/main/java/com/r11/tools/controller/XsltController.java
View File

@@ -57,41 +57,25 @@ public class XsltController implements RestController {
response.body("saxon, xalan"); response.body("saxon, xalan");
return; return;
} }
String tmp;
long timeStart;
long duration;
JsonObject responseJson = new JsonObject(); JsonObject responseJson = new JsonObject();
switch (processor) { switch (processor) {
case "saxon": case "saxon":
timeStart = System.currentTimeMillis(); processWithSaxon(response, data, query, version, responseJson);
try {
tmp = saxon.processXSLT(data, query);
response.status(200);
responseJson.addProperty("result", tmp);
responseJson.addProperty("status", "OK");
} catch (Exception ex) {
this.logger.error("Error on processing XSLT using Saxon. " + ex);
response.status(400);
responseJson.addProperty("result", ex.getMessage());
responseJson.addProperty("status", "ERR");
}
duration = System.currentTimeMillis() - timeStart;
this.logger.info("Request (XSLT, Saxon) processed in " + duration + " ms.");
responseJson.addProperty("processor", "Saxon " + saxon.getVersion() + " " + version);
responseJson.addProperty("time", duration);
response.body(this.gson.toJson(responseJson));
return; return;
case "xalan": case "xalan":
processWithXalan(response, data, query, responseJson);
return;
default:
response.body("saxon, xalan");
}
}
private void processWithXalan(Response response, String data, String query, JsonObject responseJson) {
long duration;
long timeStart;
String tmp;
timeStart = System.currentTimeMillis(); timeStart = System.currentTimeMillis();
try { try {
tmp = xalan.processXSLT(data, query); tmp = xalan.processXSLT(data, query);
@@ -116,10 +100,35 @@ public class XsltController implements RestController {
responseJson.addProperty("time", duration); responseJson.addProperty("time", duration);
response.body(this.gson.toJson(responseJson)); response.body(this.gson.toJson(responseJson));
return; }
default: private void processWithSaxon(Response response, String data, String query, String version, JsonObject responseJson) {
response.body("saxon, xalan"); long duration;
} String tmp;
long timeStart;
timeStart = System.currentTimeMillis();
try {
tmp = saxon.processXSLT(data, query);
response.status(200);
responseJson.addProperty("result", tmp);
responseJson.addProperty("status", "OK");
} catch (Exception ex) {
this.logger.error("Error on processing XSLT using Saxon. " + ex);
response.status(400);
responseJson.addProperty("result", ex.getMessage());
responseJson.addProperty("status", "ERR");
}
duration = System.currentTimeMillis() - timeStart;
this.logger.info("Request (XSLT, Saxon) processed in " + duration + " ms.");
responseJson.addProperty("processor", "Saxon " + saxon.getVersion() + " " + version);
responseJson.addProperty("time", duration);
response.body(this.gson.toJson(responseJson));
} }
} }