Changeset 13904

Timestamp:

05/26/12 11:26:43 (13 years ago)

Author:

tbretz

Message:

Use something more arbitrary for 'offline'. Get the scriptdepth from the dim-control message

File:

• trunk/FACT++/src/DimState.h (modified) (10 diffs)

trunk/FACT++/src/DimState.h

@@ -13 +13 @@
 public:
     DimState(const string &n, const string s="STATE") : server(n),
-        service(n+"/"+s), info(make_pair(Time(), -4))
+        service(n+"/"+s), info(make_pair(Time(), -256))
     {
     }
@@ -41 +41 @@
         const bool disconnected = evt.GetSize()==0;
 
-        info = make_pair(evt.GetTime(), disconnected ? -4 : evt.GetQoS());
+        info = make_pair(evt.GetTime(), disconnected ? -256 : evt.GetQoS());
 
         msg = disconnected ? "" : evt.GetString();
@@ -52 +52 @@
     const int  &state() const { return info.second; }
 
-    bool online() const { return info.second>-4; }
-
-    virtual State description() const { return State(-5, ""); }
+    bool online() const { return info.second>-256; }
+
+    virtual State description() const { return State(-257, ""); }
 };
 
@@ -64 +64 @@
     out << kBold << s.server;
 
-    if (s.state()==-4)
+    if (s.state()==-256)
         return out << ": Offline";
 
-    if (rc.index==-5)
+    if (rc.index==-257)
         return out;
 
     out << ": ";
 
-    if (rc.index==-2)
-        out << s.state();
-    else
+//    if (rc.index==-2)
+//        out << s.state();
+//    else
         out << rc.name << "[" << rc.index << "]";
 
@@ -106 +106 @@
         {
             states = State::SplitStates(evt.GetString());
-            states.push_back(State(-4, "Offline"));
+            states.push_back(State(-256, "Offline"));
         }
     }
@@ -116 +116 @@
                 return *it;
 
-        return State(-5, "n/a");
+        return State(-257, "n/a");
     }
 };
@@ -129 +129 @@
         DimState::Handler(evt);
 
-        info.second = evt.GetSize()==4 ? evt.GetInt() : -4;
+        info.second = evt.GetSize()==4 ? evt.GetInt() : 0;
     }
 
@@ -157 +157 @@
     string file;
     string shortmsg;
+    int scriptdepth;
 
     void AddCallback(const string &script, const callback &cb)
@@ -167 +168 @@
         DimState::Handler(evt);
 
-        shortmsg = msg;
-        file     = "";
+        shortmsg    = msg;
+        file        = "";
+        scriptdepth = -1;
 
         // Evaluate msg
@@ -175 +177 @@
             return;
 
+        // Evaluate scriptdepth
+        const size_t ps = msg.find_first_of('-');
+        if (ps!=string::npos)
+            scriptdepth = atoi(msg.c_str()+ps+1);
+
+        // Find filename
         const size_t p1 = msg.find_last_of('[');
         if (p1==string::npos)