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

diff --git a/tools/startup.pl b/tools/startup.pl
index 64fc3dd6edf69251ba33c15df0adaf5115403545..bce915c81e259eb734a6d363149971430504a78c 100755 (executable)
--- 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 0ad9fc1f1d4c980c5a0b05c0453cf38a545b30c0..7c66a5b40e13495476aed8031e5ae0a3fac2bc7a 100755 (executable)
--- 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 {
 #####################################