Changeset 15017 for trunk

Timestamp:

03/10/13 14:59:23 (12 years ago)

Author:

tbretz

Message:

Changed return codes from EvalOption such that 0 means 'stop, but everything is ok'

Location:

trunk/FACT++

Files:

• src/Main.h (modified) (1 diff)
• src/StateMachineDimControl.cc (modified) (1 diff)
• www/smartfact/index.php (modified) (1 diff)

trunk/FACT++/src/Main.h

@@ -155 +155 @@
             ostringstream str;
             str << "Exit triggered by EvalOptions with rc=" << rc;
-            io_service.Write(now, str.str(), MessageImp::kError);
+            io_service.Write(now, str.str(), rc==0?MessageImp::kInfo:MessageImp::kError);
             return rc;
         }

trunk/FACT++/src/StateMachineDimControl.cc

@@ -571 +571 @@
 
     if (conf.Get<bool>("stop"))
-        return Dim::SendCommand("DIM_CONTROL/STOP", fUser) + 1;
+        return !Dim::SendCommand("DIM_CONTROL/STOP", fUser);
 
     if (conf.Has("start"))
-        return Dim::SendCommand("DIM_CONTROL/START", conf.Get<string>("start")+" user='"+fUser+"'") + 1;
+        return !Dim::SendCommand("DIM_CONTROL/START", conf.Get<string>("start")+" user='"+fUser+"'");
 
     if (conf.Has("batch"))
-        return Dim::SendCommand("DIM_CONTROL/EXECUTE", conf.Get<string>("batch")+" user='"+fUser+"'") + 1;
+        return !Dim::SendCommand("DIM_CONTROL/EXECUTE", conf.Get<string>("batch")+" user='"+fUser+"'");
 
     if (conf.Has("msg"))
-        return Dim::SendCommand("CHAT/MSG", fUser+": "+conf.Get<string>("msg")) + 1;
+        return !Dim::SendCommand("CHAT/MSG", fUser+": "+conf.Get<string>("msg"));
 
     return -1;

trunk/FACT++/www/smartfact/index.php

@@ -271 +271 @@
 }
 
-if ($rc!=1 && $rc!=2)
+if ($rc>1)
     return header('HTTP/1.0 500 Execution failed [rc='.$rc."]");