|
a/tool/src/main/controller.java |
|
b/tool/src/main/controller.java |
|
... |
|
... |
| 19 |
import definitions.is;
|
19 |
import definitions.is;
|
| 20 |
import java.io.IOException;
|
20 |
import java.io.IOException;
|
| 21 |
import java.io.PrintStream;
|
21 |
import java.io.PrintStream;
|
| 22 |
import java.util.logging.Level;
|
22 |
import java.util.logging.Level;
|
| 23 |
import java.util.logging.Logger;
|
23 |
import java.util.logging.Logger;
|
|
|
24 |
import script.log;
|
| 24 |
import www.RequestOrigin;
|
25 |
import www.RequestOrigin;
|
| 25 |
import www.WebRequest;
|
26 |
import www.WebRequest;
|
| 26 |
import www.WebServer;
|
27 |
import www.WebServer;
|
| 27 |
|
28 |
|
| 28 |
/**
|
29 |
/**
|
|
... |
|
... |
| 114 |
// || (newRequest.requestOrigin == RequestOrigin.GUI)
|
115 |
// || (newRequest.requestOrigin == RequestOrigin.GUI)
|
| 115 |
//
|
116 |
//
|
| 116 |
// ){
|
117 |
// ){
|
| 117 |
|
118 |
|
| 118 |
|
119 |
|
|
|
120 |
if(newRequest == null){
|
|
|
121 |
log.write(is.ERROR, "CON001 - Received a null request");
|
|
|
122 |
return "";
|
|
|
123 |
}
|
|
|
124 |
|
| 119 |
// if there is no method selected, just call the default one
|
125 |
// if there is no method selected, just call the default one
|
|
|
126 |
if((newRequest.scriptMethod == null)
|
| 120 |
if(newRequest.scriptMethod.isEmpty()){
|
127 |
||(newRequest.scriptMethod.isEmpty())
|
|
|
128 |
){
|
| 121 |
newRequest.scriptMethod = is.methodDefault;
|
129 |
newRequest.scriptMethod = is.methodDefault;
|
| 122 |
}
|
130 |
}
|
| 123 |
|
131 |
|
| 124 |
// we need the base folder to be defined as well
|
132 |
// we need the base folder to be defined as well
|
| 125 |
newRequest.BaseFolder = newRequest.scriptFile.getParentFile();
|
133 |
newRequest.BaseFolder = newRequest.scriptFile.getParentFile();
|