Changeset 14662 for trunk

Timestamp:

11/19/12 18:28:38 (12 years ago)

Author:

tbretz

Message:

Added the possibility to get resource values from the dimctrl to the JavaScripts (on the dimctrl server)

Location:

trunk/FACT++/src

Files:

• StateMachineDimControl.cc (modified) (3 diffs)
• StateMachineDimControl.h (modified) (1 diff)
• dimctrl.cc (modified) (2 diffs)

trunk/FACT++/src/StateMachineDimControl.cc

@@ -97 +97 @@
 
     const map<string,string> data = Tools::Split(opt, true);
-
     if (imp.GetSize()==0 || opt.size()==0 || opt[0]==0)
     {
@@ -119 +118 @@
     }
 
-    Readline::SetExternalInput(cmd+imp.GetString());
+    string emit = cmd+imp.GetString();
+    if (cmd==".js ")
+        emit += fArgumentsJS;
+
+    Readline::SetExternalInput(emit);
     return 1;
 }
@@ -490 +493 @@
     fScriptUser = fUser;
 
+    const map<string, string> &js = conf.GetOptions<string>("JavaScript.");
+    for (auto it=js.begin(); it!=js.end(); it++)
+    {
+        string key = it->first;
+        string val = it->second;
+
+        // Escape key
+        boost::replace_all(key, "\\", "\\\\");
+        boost::replace_all(key, "'", "\\'");
+        boost::replace_all(key, "\"", "\\\"");
+
+        // Escape value
+        boost::replace_all(val, "\\", "\\\\");
+        boost::replace_all(val, "'", "\\'");
+        boost::replace_all(val, "\"", "\\\"");
+
+        fArgumentsJS += " '"+key +"'='"+val+"'";
+    }
+
     // fVerbosity = 40;
 

trunk/FACT++/src/StateMachineDimControl.h

@@ -32 +32 @@
     std::string fUser;
     std::string fScriptUser;
+
+    /// Default arguments provided to very java script
+    std::string fArgumentsJS;
 
     std::string Line(const std::string &txt, char fill);

trunk/FACT++/src/dimctrl.cc

@@ -21 +21 @@
         ("server",       po_bool(false),  "Start dimctrl as a dim server (console mode switched off)")
         ("force-console",po_switch(),     "Forces console mode in server-mode.")
-        // ("verbosity,v",  var<uint32_t>()->implicit_value(0), "Set a new verbosity level (see MessageImp)")
-        // ("quiet,q",      po_bool(false),  "Suppress all output except comments (log-level>=90)")
         ("debug",        po_bool(false),  "Print the labels for debugging purpose")
         ("start",        var<string>(),   "Start a java script with the given name on the dimctrl-server")
@@ -29 +27 @@
         ("msg",          var<string>(),   "Send a message to the chat server.")
         ("user,u",       var<string>(""), "A user name - just for logging purposes (default is ${USER})")
+        ("JavaScript.*", var<string>(""), "Additional arguments which are provided to JavaScripts started in a dimctrl server via the START command")
         ;