Changeset 10327 for trunk

Timestamp:

04/08/11 14:08:45 (14 years ago)

Author:

tbretz

Message:

Switched on the non dim-standard formats for DimCommands; improved the output if the Converter throws an exception.

Location:

trunk/FACT++/src

Files:

• ServiceList.cc (modified) (3 diffs)
• StateMachineImp.cc (modified) (2 diffs)

trunk/FACT++/src/ServiceList.cc

@@ -734 +734 @@
     const string fmt = GetFormat(cmd);
 
-    // Convert the user enetered data according to the format string
+    // Convert the user entered data according to the format string
     // into a data block which will be attached to the event
-    lout << kBlue << cmd;
-
-    const Converter conv(lout, fmt);
+    const Converter conv(lout, fmt, false);
     if (!conv)
     {
@@ -747 +745 @@
     try
     {
+        lout << kBlue << cmd;
         const vector<char> v = conv.GetVector(str.substr(p0));
+        lout << endl;
 
         const int rc = DimClient::sendCommand(cmd.c_str(), (void*)v.data(), v.size());
@@ -757 +757 @@
     catch (const std::runtime_error &e)
     {
-        lout << kRed << e.what() << endl;
+        lout << endl << kRed << e.what() << endl;
         return false;
     }

trunk/FACT++/src/StateMachineImp.cc

@@ -231 +231 @@
     // Convert the user enetered data according to the format string
     // into a data block which will be attached to the event
-    lout << kBlue << name;
-
     const Converter conv(lout, fmt, false);
     if (!conv)
@@ -242 +240 @@
     try
     {
+        lout << kBlue << name;
         const vector<char> v = conv.GetVector(str.substr(p0));
+        lout << endl;
+
         return PostEvent(*evt, v.data(), v.size());
     }
     catch (const std::runtime_error &e)
     {
-        lout << kRed << e.what() << endl;
+        lout << endl << kRed << e.what() << endl;
     }