added execution of xml2ini to startup

diff --git a/tools/startup.pl b/tools/startup.pl
index fa956d35a30182c1dcd52c2ece71f828090ff2f8..398d6586a11ca18ef5b6866e3d422786956d3cc9 100755 (executable)
--- a/tools/startup.pl
+++ b/tools/startup.pl
@@ -12,6 +12,7 @@ $Data::Dumper::Useqq = 0;
 
 my ($help, $man, $verbose, $setup, $dryrun);
 my $defaultIniPath = "/tmp/inifiles";
+my $defaultXmlPath = "../";
 
 
 ###############################
@@ -36,7 +37,11 @@ unless (defined $ENV{'JTAGCONFIGPATH'}) {
   $ENV{'JTAGCONFIGPATH'} = $defaultIniPath;
   mkdir($defaultIniPath) unless (-e $defaultIniPath);
   }
-  
+
+unless (defined $ENV{'XMLPATH'}) {
+  printf "XMLPATH not set in environment. Points to XML file directory. Using default.\n" if $verbose;
+  $ENV{'XMLPATH'} = $defaultXmlPath;
+  }  
   
 ###############################
 ## Read setup xml file
@@ -82,6 +87,7 @@ foreach my $curctrl ($db->getDocumentElement->findnodes('controller')) {
       push(@commands,"./ui.pl -b $ctrlname -c $chainname -o ".$cfg->textContent());
       }
     $chainsini->{$ctrlid} .= proto_chainsini($chainname,$chainid,$ctrladdr,\@sname,\@sfile,\@senable);
+    sensorini(\@sfile);
     }
   foreach my $cfg ($curctrl->findnodes('config')) {
     print STDERR "  Found config\n" if $verbose;
@@ -128,6 +134,12 @@ sub execute {
   }
  
 
+sub sensorini {
+  my ($sfile) = @_;
+  for (my $s=0;$s<scalar @{$sfile};$s++) {
+    qx(./xml2ini.pl -c $sfile->[$s] -o $defaultIniPath/$sfile->[$s].ini);
+    }
+  }
 
 ###############################
 ## Fill information to template ini files
@@ -184,7 +196,7 @@ DEBUGram1crun=0xa%.($id*2+1).qq%4b
 ;BEGIN GENERATE_CHAINORDER $name
 %;
 for (my $s=0;$s<scalar @{$sname};$s++) {
-  $sfile->[$s] =~ s\.xml\.ini\;
+  $sfile->[$s] .= ".ini";
   $r .=";" unless($senable->[$s]);
   $r .= "JNR".$s."_".$sname->[$s]."=".$sfile->[$s]."\n";
   }