From: www@jspc55 <www@jspc55>
Date: Tue, 1 Jul 2014 12:51:55 +0000 (+0200)
Subject: changed output format of run.pl -> more tidy formatted console output in testgui.pl
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0cb1eafea91a336af17f964438d1e099826de4c8;p=mvdsensorcontrol.git

changed output format of run.pl -> more tidy formatted console output in testgui.pl
---

diff --git a/tools/run.pl b/tools/run.pl
index 24e3e23..2b09d76 100755
--- a/tools/run.pl
+++ b/tools/run.pl
@@ -78,27 +78,28 @@ unless(-e $picPath or mkdir $picPath) {
 # system("./startup.pl ".SETUPFILE);
 
 my $dummy;
-
-$dummy  =qx|date|;
-$dummy .=qx"./startup.pl $setupFile";
+print "<pre>";
+print qx|date|;
+print qx"./startup.pl $setupFile";
 
 unless($q->param('startupOnly') eq 'true'){
-  $dummy.=qx|date|;
-  $dummy.=qx"rm $dumpPath/te1*.hld 2>&1";
-  $dummy.=qx"./preview/exec_evtbuild_t.pl -t $runtime -p $dumpPath -s $systemName -d $ports 2>&1";
-  $dummy.=qx|date|;
-  $dummy.=qx"rm $dumpPath/temp.hld 2>&1";
-  $dummy.=qx"mv $dumpPath/te1* $dumpPath/temp.hld 2>&1";
-  $dummy.=qx|ls -lh  $dumpPath/temp.hld|;
-  $dummy.=qx|date|;
-  $dummy.=qx"rm $picPath/$systemName*.png 2>&1"; # delete old pictures
-#  $dummy.=qx"./preview/unpack_hld.pl -r -f $dumpPath/temp.hld -p $picPath -s $systemName 2>&1";
-  $dummy.=qx"./unpacker/run.sh $dumpPath/temp.hld $picPath $systemName 2>&1";
-  $dummy.=qx|date|;
+  print qx|date|;
+  print qx"rm $dumpPath/te1*.hld 2>&1";
+  print qx"./preview/exec_evtbuild_t.pl -t $runtime -p $dumpPath -s $systemName -d $ports 2>&1";
+  print qx|date|;
+  print qx"rm $dumpPath/temp.hld 2>&1";
+  print qx"mv $dumpPath/te1* $dumpPath/temp.hld 2>&1";
+  print qx|ls -lh  $dumpPath/temp.hld|;
+  print qx|date|;
+  print qx"rm $picPath/$systemName*.png 2>&1"; # delete old pictures
+#  print qx"./preview/unpack_hld.pl -r -f $dumpPath/temp.hld -p $picPath -s $systemName 2>&1";
+  print qx"./unpacker/run.sh $dumpPath/temp.hld $picPath $systemName 2>&1";
+  print qx|date|;
 }
-my $escapedDummy = escapeHTML($dummy);
-$escapedDummy =~ s/\n/<br>/g;
-print $escapedDummy;
+#my $escapedDummy = escapeHTML($dummy);
+#$escapedDummy =~ s/\n/<br>/g;
+#print $escapedDummy;
+print "</pre>";
 
 print end_html;