From: Michael Wiebusch <stratomaster@gmx.net>
Date: Tue, 3 Dec 2013 10:50:04 +0000 (+0100)
Subject: implemented daqopserver tag in the setup xmls, parsed by startup.pl
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=3d13147a4c6b4ca4ebd2c09ea5625d075ba6bfc9;p=mvdsensorcontrol.git

implemented daqopserver tag in the setup xmls, parsed by startup.pl
---

diff --git a/tools/startup.pl b/tools/startup.pl
index 64fc3dd..bce915c 100755
--- a/tools/startup.pl
+++ b/tools/startup.pl
@@ -64,7 +64,13 @@ my $filename = $ARGV[0];
 my $db = $parser->parse_file($filename);
 my $name = $db->getDocumentElement->getAttribute('name');
 print STDERR "Loading setup $name from file $filename\n" if $verbose;
-  
+
+my $daqopserver = $db->getDocumentElement->findvalue('daqopserver');
+$ENV{'DAQOPSERVER'}       = $daqopserver if defined($daqopserver);
+print "DAQOPSERVER = ".$ENV{'DAQOPSERVER'}."\n" if $verbose;
+
+
+
 foreach my $curctrl ($db->getDocumentElement->findnodes('controller')) {
   my $ctrlname = $curctrl->getAttribute('name');
   my $ctrlid   = $curctrl->getAttribute('id');
diff --git a/tools/testgui.pl b/tools/testgui.pl
index 0ad9fc1..7c66a5b 100755
--- a/tools/testgui.pl
+++ b/tools/testgui.pl
@@ -59,8 +59,12 @@ my $q = CGI->new;
 
 if( not(defined($q->param())) or $q->param('setup') ) {
   #if called without arguments, or given a definitive setup file
-  $setupFileName = $q->param('setup'); 
-  $setupFile = $setupDir."/".$setupFileName;
+  $setupFileName = $q->param('setup');
+  if (defined($setupFileName)) {
+    $setupFile = $setupDir."/".$setupFileName;
+  } else {
+    $setupFile = "...";
+  }
   init_html();
 } else {
 #####################################