Changeset 51 for drsdaq/DAQReadout.cc

Timestamp:

05/28/09 15:44:05 (15 years ago)

Author:

ogrimm

Message:

Added command line editing

File:

• drsdaq/DAQReadout.cc (modified) (1 diff)

drsdaq/DAQReadout.cc

@@ -1019 +1019 @@
   vsnprintf(Textbuffer, sizeof(Textbuffer), Format, ArgumentPointer);
   
-  // Print to console and generate new prompt
+  // Print to console
   if(Target & MsgToConsole) {
-    if(strlen(Textbuffer)>0 && Textbuffer[strlen(Textbuffer)-1]=='\n') printf("\r%s", Textbuffer);
+    if(strlen(Textbuffer)>0 && Textbuffer[strlen(Textbuffer)-1]=='\n') {
+      printf("\r%s%s", Textbuffer, Prompt);   // New prompt
+      fflush(stdout);
+    }
     else printf("%s", Textbuffer);
-
-    // New prompt only after newline
-    if(Textbuffer[strlen(Textbuffer)-1]=='\n' || strlen(Textbuffer)==0) {
-      if (NumBoards == 0) printf("\rDAQ> "); 
-      else if (FirstBoard == LastBoard) printf("\rDAQ|B%d> ",FirstBoard); 
-      else printf("\rDAQ|B%d-%d> ",FirstBoard,LastBoard); 
-      fflush(stdout);
-    }
-  }
-
-  // Print to log file and socket only if length not zero (then only prompt)
-  if (strlen(Textbuffer)>0) {
-    if((Target & MsgToLog) && Logfile!=NULL) {
-      fprintf(Logfile, "%s", Textbuffer);
-      fflush(Logfile);
-    }
-    if((Target & MsgToSocket) && Socket!=-1) write(Socket, Textbuffer, strlen(Textbuffer));
-  }
+  }
+  // Print to log file
+  if((Target & MsgToLog) && Logfile!=NULL) {
+    fprintf(Logfile, "%s", Textbuffer);
+    fflush(Logfile);
+  }
+  // Print to socket
+  if((Target & MsgToSocket) && Socket!=-1) write(Socket, Textbuffer, strlen(Textbuffer));
 }