Changeset 18823 for trunk/FACT++

Timestamp:

04/14/17 12:22:21 (8 years ago)

Author:

tbretz

Message:

For consistency, pass the local arguments from the resource file also to .js and .java. No check for a missing equal sign is needed... positional arguments were allowed.

File:

• trunk/FACT++/src/RemoteControl.h (modified) (2 diffs)

trunk/FACT++/src/RemoteControl.h

@@ -431 +431 @@
         if (str.substr(0, 4)==".js ")
         {
-            string opt(str.substr(4));
-
-            map<string,string> data = Tools::Split(opt, true);
-            if (opt.size()==0)
-            {
-                if (data.size()==0)
-                    lout << kRed << "JavaScript filename missing." << endl;
-                else
-                    lout << kRed << "Equal sign missing in argument '" << data.begin()->first << "'" << endl;
-
+            string opt(str.substr(4)+" "+fImp->GetArguments());
+
+            const map<string,string> data = Tools::Split(opt, true); // allow positional arguments
+            if (opt.size()==0 && data.size()==0)
+            {
+                lout << kRed << "JavaScript filename missing." << endl;
                 return true;
             }
@@ -453 +449 @@
         }
 
-        if (str==".java" && !StateMachineDimControl::fIsServer)
-        {
+        if ((str==".java" || str.substr(0,6)==".java ") && !StateMachineDimControl::fIsServer)
+        {
+            string opt(str+" "+fImp->GetArguments());
+
+            const map<string,string> data = Tools::Split(opt, true); // allow positional arguments
+
             T::fScript = "java";
 
             T::Lock();
-            JsRun("");
+            JsRun("", data);
             T::Unlock();