mirrors/graphonline
1
0
Fork 0
mirror of https://github.com/UnickSoft/graphonline.git synced 2026-02-16 02:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run cgi algorithm if emscripted throw exception.

Browse Source
This commit is contained in:
Oleg Sh
2024-08-27 22:11:40 +02:00
parent 430a5a4a1c
commit aac9da9d45
6 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
script/features/algorithms/model/Algorithms.js
View File

@@ -255,16 +255,8 @@ BaseAlgorithmEx.prototype.CalculateAlgorithm = function(algorithmName, otherPara
resultCallback(pathObjects, properties, result);
};
if (this.app.isSupportEmscripten()) {
console.log("Use Emscripten");
var delimiter = "<s\\emscript_split\\s>";
var processData = algorithmName + delimiter + xml +
delimiter + "report" + delimiter + "xml";
otherParams.forEach ( (param) => processData += delimiter + param.name + delimiter + param.value);
var res = this.app.processEmscripten(processData);
processResult(res);
} else {
console.log("Use new CGI");
var callCGIAlgorithms = function ()
{
var queryString = algorithmName + "=cgiInput&report=xml";
otherParams.forEach ( (param) => queryString += "&" + param.name + "=" + param.value);
$.ajax({
@@ -277,6 +269,27 @@ BaseAlgorithmEx.prototype.CalculateAlgorithm = function(algorithmName, otherPara
{
processResult(msg);
});
};
if (this.app.isSupportEmscripten()) {
console.log("Use Emscripten");
var delimiter = "<s\\emscript_split\\s>";
var processData = algorithmName + delimiter + xml +
delimiter + "report" + delimiter + "xml";
otherParams.forEach ( (param) => processData += delimiter + param.name + delimiter + param.value);
var res = {};
try {
res = this.app.processEmscripten(processData);
}
catch (error) {
console.log("Error on Emscripten: " + error + "\n" + error.stack);
callCGIAlgorithms();
return true;
}
processResult(res);
} else {
console.log("Use new CGI");
callCGIAlgorithms();
}
return true;