created Environment.pm with all important hardcoded settings

diff --git a/Environment.pm b/Environment.pm
new file mode 100644 (file)
index 0000000..cd9bb30
--- /dev/null
+++ b/Environment.pm
@@ -0,0 +1,21 @@
+
+#Import settings from environment or assign default values
+
+use constant DAQOPSERVER      => $ENV{'DAQOPSERVER'}    || "localhost:7";
+use constant JTAGPATH         => $ENV{'JTAGPATH'}       || "/local.1/jtag_mvd/soft/toolbox/jtag_atomic/";
+use constant JTAGCONFIGPATH   => $ENV{'JTAGCONFIGPATH'} || "/tmp/inifiles";
+use constant XMLPATH          => $ENV{'XMLPATH'}        || "/local.1/htdocs/jtag/";
+
+use constant SETUPFILE        => "/local.1/htdocs/jtag/setup/testsetup.xml";
+my $additionalpath = ":/local.1/bastelstube/daqdata/bin";
+
+
+#Export variables that are used elsewhere
+$ENV{'DAQOPSERVER'}       = DAQOPSERVER       unless defined $ENV{'DAQOPSERVER'};
+$ENV{'JTAGPATH'}          = JTAGPATH          unless defined $ENV{'JTAGPATH'};
+$ENV{'JTAGCONFIGPATH'}    = JTAGCONFIGPATH    unless defined $ENV{'JTAGCONFIGPATH'};
+$ENV{'XMLPATH'}           = XMLPATH           unless defined $ENV{'XMLPATH'};
+
+$ENV{'PATH'} = $ENV{'PATH'}.$additionalpath;
+
+1;
\ No newline at end of file

diff --git a/index.pl b/index.pl
index c7dfc829d6e75cb5d52b94e789a33840fe094df4..383dab9f39e7c53dc0ac02b86796441b1e08d9e1 100755 (executable)
--- a/index.pl
+++ b/index.pl
@@ -30,6 +30,7 @@ Guess what? We didn't write any!
 <ul>
 <li><a href="tools/jtageditor.pl">Edit JTAG configuration files</a>
 <li><a href="tools/testgui.pl">Quick Analysis of sensor data</a>
+<li><a href="tools/statusgui.pl">Some status information</a>
 <li><a href="http://cerberus.x-matter.uni-frankfurt.de:8000/tools/pwr">Power Supply Control</a>
 </ul>
 </div>

diff --git a/layout/jtageditor_blue.css b/layout/jtageditor_blue.css
index f62e73b1ffa52084b91545d6033e482e7fd044bf..193d2a46e2bad6db4321f08c281fc0f554625d12 100644 (file)
--- a/layout/jtageditor_blue.css
+++ b/layout/jtageditor_blue.css
@@ -3,56 +3,40 @@ body {
     color:#445;
 }
 
-#debug {
-   position:absolute;
-   top:100px;
-   left:800px;
-   width:220px;
-   padding:10px;
-   background:#eef;
-   border-radius:5px;
-   box-shadow:0 0 10px 5px #fff, 0 0 4px 1px #78b inset;
-   margin:0px;
-}
 
 
+#roterBereich, #blauerBereich, #fileSelection, #debug, #overview {
+  float:left;
+  position:relative;
+  width:320px;
+  padding:10px;
+  margin:50px 10px 0 30px;
+  border-radius:5px;
+  background:#eef;
+  box-shadow: 0 0 10px 5px #fff,  0 0 4px 1px #78b inset;
+  }
+
 #fileSelection {
-   float:left;
-   position:relative;
    width:700px;
    min-height:50px;
-   padding:10px;
    margin:50px 0 0 20px;
-   border-radius:5px;
-   background:#eef;
-   box-shadow: 0 0 10px 5px #fff,  0 0 4px 1px #78b inset;
 }
 
 #roterBereich {
-   clear:both;
-   float:left;
-   position:relative;
-   width:320px;
-   padding:10px;
-   margin:50px 10px 0 20px ;
-   border-radius:5px;
-   background:#eef;
-   box-shadow: 0 0 10px 5px #fff,  0 0 4px 1px #78b inset;
-}
-
-#blauerBereich {
-   float:left;
-   position:relative;
-   width:320px;
-   padding:10px;
-   margin:50px 10px 0 30px;
-   border-radius:5px;
-   background:#eef;
-   box-shadow: 0 0 10px 5px #fff,  0 0 4px 1px #78b inset;
-   }
-
-input[type="text"]
-{
+  clear:both;
+  }
+  
+#debug {
+   position:absolute;
+   top:100px;
+   left:800px;
+   width:220px;
+   margin:0px;
+}
+
+  
+  
+input[type="text"] {
     background-color:#dde;
     color:#444;
     font-size:10px;
@@ -207,12 +191,11 @@ table.fields td.button_move:hover, table.registers td.button_move:hover{
 
 
 div.header {
-    font-size:13pt;
-    position:absolute;
-    font-weight:bold;
-    top:-20px;
-    color:#88a;
-    z-index:-1;
-
-   }
+  font-size:13pt;
+  position:absolute;
+  font-weight:bold;
+  top:-20px;
+  color:#88a;
+  z-index:-1;
+  }
 

diff --git a/tools/jtageditor.pl b/tools/jtageditor.pl
index 43d7ffedf21f862acb8c49018db27cd7985adafc..898a549cf7e3225b87627a73eded64c11926125a 100755 (executable)
--- a/tools/jtageditor.pl
+++ b/tools/jtageditor.pl
@@ -495,8 +495,8 @@ sub initPage {
 <HEAD>
 <title>JTAG Editor</title>
 <link href="../layout/styles.css" rel="stylesheet" type="text/css"/>
-<link href="../layout/jtageditor.css" rel="stylesheet" title="default" type="text/css"/>
-<link href="../layout/jtageditor_blue.css" rel="alternate stylesheet" title="Light Blue" type="text/css"/>
+<link href="../layout/jtageditor_blue.css" rel="stylesheet" title="Light Blue" type="text/css"/>
+<link href="../layout/jtageditor.css" rel="alternate stylesheet" title="Old Colors" type="text/css"/>
 EOF
   printJavaScripts();
   print <<EOF;

diff --git a/tools/preview/exec_evtbuild_t.pl b/tools/preview/exec_evtbuild_t.pl
index 7cff77cb252e76fd5a24ee304d2f11133a71ca65..ec30ae0717d8b3552a77da3b188e422d9039878d 100755 (executable)
--- a/tools/preview/exec_evtbuild_t.pl
+++ b/tools/preview/exec_evtbuild_t.pl
@@ -6,7 +6,7 @@ use warnings;
 use Data::Dumper;
 use feature 'say';
 require POSIX;
-use Bit::Vector;
+# use Bit::Vector;
 use Getopt::Long;
 use threads;
 

diff --git a/tools/run.pl b/tools/run.pl
index a9254d43c1261e9a2d18ad5717e55eaa4f43e891..29c6dc30753d422af6d7bee306bdbfb05e0284f6 100755 (executable)
--- a/tools/run.pl
+++ b/tools/run.pl
@@ -7,12 +7,17 @@ use strict;
 use warnings;
 use POSIX;
 use CGI ':standard';
-use Cwd;
+# use Cwd;
 use CGI::Carp qw(fatalsToBrowser);
 use HTML::Entities;
 # require Common;
 # require xmlOperations;
 
+use FindBin;
+use lib "$FindBin::Bin/..";
+use Environment;
+
+
 my $here = getcwd();
 
 my $runtime = 0.2;
@@ -31,13 +36,13 @@ print start_html(
 # print escapeHTML("hallo<<<>>>&&&!!"),br;
 # print escapeHTML($here);
 # $ENV{'PATH'}=$ENV{'PATH'}.":/home/hadaq/bin";
-$ENV{'PATH'}=$ENV{'PATH'}.":/local.1/bastelstube/daqdata/bin";
+# $ENV{'PATH'}=$ENV{'PATH'}.":/local.1/bastelstube/daqdata/bin";
 # print br,$ENV{'PATH'},br;
-$ENV{'JTAGPATH'}="/local.1/jtag_mvd/soft/toolbox/jtag_atomic/";
-$ENV{'DAQOPSERVER'}="localhost:7";
+# $ENV{'JTAGPATH'}="/local.1/jtag_mvd/soft/toolbox/jtag_atomic/";
+# $ENV{'DAQOPSERVER'}="localhost:7";
 
 
-system("./startup.pl ../setup/testsetup.xml");
+system("./startup.pl ".SETUPFILE);
 chdir("preview");
 
 my $dummy;

diff --git a/tools/startup.pl b/tools/startup.pl
index 3c2a9c0f9c8a53b9e8c2b83ff3150844241a4bf8..7440e6db48e76228768e04cdeb08e4f063f2a197 100755 (executable)
--- a/tools/startup.pl
+++ b/tools/startup.pl
@@ -10,9 +10,14 @@ use Pod::Usage;
 $Data::Dumper::Terse = 1;
 $Data::Dumper::Useqq = 0;
 
+use FindBin;
+use lib "$FindBin::Bin/..";
+use Environment;
+
+
 my ($help, $man, $verbose, $setup, $dryrun);
-my $defaultIniPath = "/tmp/inifiles";
-my $defaultXmlPath = "../";
+# my $defaultIniPath = "/tmp/inifiles";
+# my $defaultXmlPath = "../";
 
 
 ###############################
@@ -28,23 +33,24 @@ GetOptions(
 pod2usage(1) if $help;
 pod2usage(-exitval => 0, -verbose => 2) if $man;
 
-
-die "DAQOPSERVER not set in environment. Points to trbnetd that provides access to TRB.\n" unless (defined $ENV{'DAQOPSERVER'});
-die "JTAGPATH not set in environment. Points to JTAG tools (e.g. ui.pl).\n" unless (defined $ENV{'JTAGPATH'});
-
-unless (defined $ENV{'JTAGCONFIGPATH'}) {
-  printf "JTAGCONFIGPATH not set in environment. Points to JTAG config files (e.g. chains.ini). Using default $defaultIniPath\n" if $verbose;
-  $ENV{'JTAGCONFIGPATH'} = $defaultIniPath;
-  }
-
-unless (defined $ENV{'XMLPATH'}) {
-  printf "XMLPATH not set in environment. Points to XML file directory. Using default $defaultXmlPath\n" if $verbose;
-  $ENV{'XMLPATH'} = $defaultXmlPath;
-  }  
+#Variables are set in Environment.pm!
+
+# die "DAQOPSERVER not set in environment. Points to trbnetd that provides access to TRB.\n" unless (defined $ENV{'DAQOPSERVER'});
+# die "JTAGPATH not set in environment. Points to JTAG tools (e.g. ui.pl).\n" unless (defined $ENV{'JTAGPATH'});
+# 
+# unless (defined $ENV{'JTAGCONFIGPATH'}) {
+#   printf "JTAGCONFIGPATH not set in environment. Points to JTAG config files (e.g. chains.ini). Using default ".JTAGCONFIGPATH."\n" if $verbose;
+#   $ENV{'JTAGCONFIGPATH'} = $defaultIniPath;
+#   }
+# 
+# unless (defined $ENV{'XMLPATH'}) {
+#   printf "XMLPATH not set in environment. Points to XML file directory. Using default $defaultXmlPath\n" if $verbose;
+#   $ENV{'XMLPATH'} = $defaultXmlPath;
+#   }  
   
   
-$defaultIniPath = $ENV{'JTAGCONFIGPATH'};
-$defaultXmlPath = $ENV{'XMLPATH'};
+my $defaultIniPath = JTAGCONFIGPATH;
+my $defaultXmlPath = XMLPATH;
 mkdir($defaultIniPath) unless (-e $defaultIniPath);
 
   

diff --git a/tools/statusgui.pl b/tools/statusgui.pl
new file mode 100755 (executable)
index 0000000..3799dc2
--- /dev/null
+++ b/tools/statusgui.pl
@@ -0,0 +1,97 @@
+#!/usr/bin/perl -w
+print "Content-type: text/html\n\n";
+
+
+use CGI ':standard';
+use XML::LibXML;
+use POSIX;
+use CGI::Carp qw(fatalsToBrowser);
+
+use FindBin;
+use lib "$FindBin::Bin/..";
+use Environment;
+
+
+my $configFile = '/local.1/htdocs/jtag/setup/testsetup.xml';
+
+
+
+my ($command) = split("-",$ENV{'QUERY_STRING'});
+
+$command = "" unless defined $command;
+
+if($command eq "setup") {readConfig($configFile,1);}
+else                    {initPage();}
+
+
+
+
+
+sub readConfig {
+  my ($file,$write) = @_;
+  my $parser = XML::LibXML->new(line_numbers => 1);
+  my $db = $parser->parse_file($file);
+  my $name = $db->getDocumentElement->getAttribute('name');
+  print h2("Read-out Controllers");  
+  foreach my $curctrl ($db->getDocumentElement->findnodes('controller')) {
+    my $ctrlname = $curctrl->getAttribute('name');
+    my $ctrlid   = $curctrl->getAttribute('id');
+    my $ctrladdr = $curctrl->getAttribute('address');
+    
+
+    foreach my $curchain ($curctrl->findnodes('chain')) {
+      my $chainid   = $curchain->getAttribute('id');
+      my $chainname = $curchain->getAttribute('name');
+      }
+    }
+  }
+
+
+
+sub initPage {
+
+  print <<EOF;
+<HTML>
+<HEAD>
+<title>JTAG Editor</title>
+<link href="../layout/styles.css" rel="stylesheet" type="text/css"/>
+<link href="../layout/jtageditor_blue.css" rel="stylesheet" title="Light Blue" type="text/css"/>
+EOF
+  printJavaScripts();
+  print <<EOF ;
+</HEAD>
+<BODY>
+<h2>JTAG Status</h2>
+<div id="debug">
+<div class="header">Debug Output</div>
+debug text
+</div>
+<div id="overview">
+EOF
+readConfig($configFile,1);
+print <<EOF ;
+</div>
+
+
+</BODY>
+</HTML>
+EOF
+}
+
+
+
+
+sub printJavaScripts {
+
+####### javascript function land ################
+
+  print <<EOF;
+
+<script language="javascript">
+
+</script>
+EOF
+}
+
+
+