--- a/tool/src/GUI/StudioUI2.java
+++ b/tool/src/GUI/StudioUI2.java
@@ -63,7 +63,9 @@
private File
baseFolderPresent = null,
- baseFolderPrevious = null;
+ baseFolderPast = null,
+ baseFilePresent = null,
+ baseFilePast = null;
/**
* Creates new form StudioUI2
@@ -512,15 +514,26 @@
// this is needed to workaround a defect in text/plain mode
text.setCursor(Cursor.getDefaultCursor());
}
-
- // no point to continue if the request is empty
+
+ // no point to continue if the request is empty
if(request == null){
baseFolderPresent = null;
return;
}
+ // keep track of what was executed last time
+ if(request.scriptFile != null){
+ baseFilePast = baseFilePresent;
+ baseFilePresent = request.scriptFile;
+ }else{
+ baseFilePast = null;
+ baseFilePresent = null;
+ }
+
+
+
// this is necessary to load pages from the same folder
- baseFolderPrevious = baseFolderPresent;
+ baseFolderPast = baseFolderPresent;
baseFolderPresent = request.BaseFolder;
// important step, sometimes we just want to define a page on disk
@@ -593,7 +606,8 @@
lastPage.getText());
// destroy the old page
lastPage = new Page();
- baseFolderPresent = baseFolderPrevious;
+ baseFolderPresent = baseFolderPast;
+ baseFilePresent = baseFilePast;
// disable button
button.setEnabled(false);
}
@@ -691,12 +705,13 @@
// remove the "?" from the string
String parameters = URL.substring(1);
- //TODO this needs to be sorted
-// String script = baseFolderPresent.;
+ // the script can't have the full path defined, just a relative path
+ String temp = baseFilePresent.getAbsolutePath();
+ String script = temp.replace(core.getPluginsFolder().getAbsolutePath(), "");
// request.
// execute the link request
- // processFormSubmit2(request, script, parameters);
+ processFormSubmit2(request, script, parameters);
return;
}