added file creation routine

diff --git a/config/settings.xml b/config/settings.xml
index 82d9e4c56daf6840167ac204b8346767fc8a5f4a..2267ce0fd061865a6275d5dfb0f1b18a0a3aa587 100644 (file)
--- a/config/settings.xml
+++ b/config/settings.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml">
-<register name="DAC_BIAS"><field name="ID2PWRS" value="11"/></register><register name="CONTROL_PIX_REG"><field name="SelPad1" value="10"/></register></MAPS>
+<register name="DAC_BIAS"><field name="ID2PWRS" value="118"/></register><register name="CONTROL_PIX_REG"><field name="SelPad1" value="010"/></register></MAPS>

diff --git a/xml_spielwiese/cgitest.pl b/xml_spielwiese/cgitest.pl
index 037dbc31dd6d7ea1aa4c1249c958df521384acff..73183269131ea064da59c478580fee636508d90b 100755 (executable)
--- a/xml_spielwiese/cgitest.pl
+++ b/xml_spielwiese/cgitest.pl
@@ -79,8 +79,9 @@ if ( $cgiHash{'print'} eq 'fileSelection' ) {
 if ( $cgiHash{'print'} eq 'spectree' ) {
        print "<div class='header'>Available Settings</div>\n";
        parseSetAndSpec( $cgiHash{'configFile'} );
-       print
 "<div class='ancestorInfo' align='center'>specifications loaded from $specfileName</div>";
+
+
        print_registers($specfile);
 }
 
@@ -88,18 +89,21 @@ if ( $cgiHash{'print'} eq 'settree' ) {
        print "<div class='header'>Selected Settings</div>\n";
        parseSetAndSpec( $cgiHash{'configFile'} );
        buildAncestry($setfileName);
-#      assignFieldColors();#obsolete
 
-       $settree = $ancestryTree; # not so elegant
-       print "<div class='ancestorInfo' align='center'>";
-       print "inherit settings from:<br>";
-       print "<table>";
-       for my $ancestor (@ancestryList) {
-               print "<tr class=fileLevel".$fileLevelHash{$ancestor}."><td>$ancestor</td></tr>";
-       }
-       print "</table>";
+       #       assignFieldColors();#obsolete
+
+       $settree = $ancestryTree;    # not so elegant
+       print "<table><tr>";
+       print "<td>";
+       print_ancestorInfo();
+       print "</td>";
+       print "<td style='border-right:1px solid #000000'><br></td>";   
+       print "<td>";
+       
+       print "<div align='center'>you are editing<br><table><tr class='fileLevel'><td>$setfileName</td></tr></table></div>";
+       print "</td>";
+       print "</tr></table>";
 
-       print "</div>";
        print_registers($setfile);
 }
 
@@ -123,10 +127,58 @@ if ( defined $cgiHash{'action'} ) {
                del( $cgiHash{'register'}, "" ); # delete existing register from setfile
                copyDefaultRegister( $cgiHash{'register'} );
        }
+       if ( $cgiHash{'action'} eq 'createFile' ) {
+               createFile($cgiHash{'configFile'},$cgiHash{'specFile'});
+       }
 }
 
 #################### SUBLAND ######################
 
+
+sub createFile {
+       my $configFileName=$_[0];
+       
+       my $specFileName=$_[1]; #config file is based on this specification!
+       my $configFile= $confDir."/".$configFileName;
+       my $specFile=$specDir."/".$specFileName;
+       
+       my $configTree = XML::LibXML->createDocument;
+       my $specTree = $parser->parse_file($specFile);
+       
+       my $configMaps = $configTree->createElementNS( "", "MAPS" );
+       $configTree->setDocumentElement( $configMaps );
+
+       my $specMaps = $specTree->findnodes("/MAPS")->shift();
+       
+       my $mapsType = $specMaps->findvalue("./\@type");
+       
+       $configMaps->setAttribute("type",$mapsType);
+       $configMaps->setAttribute("specDbFile",$specFileName);
+       
+       
+       open( SCHREIBEN, "> $configFile" )
+         or print "could not open file $configFile for writing: $!\n";
+
+       print SCHREIBEN $configTree->toString();
+       close SCHREIBEN;
+       
+}
+
+sub print_ancestorInfo {
+       print "<div class='ancestorInfo' align='center'>";
+       if (@ancestryList) {
+               print "inherit settings from:<br>";
+               print "<table>";
+               for my $ancestor (@ancestryList) {
+                       print "<tr class=fileLevel"
+                         . $fileLevelHash{$ancestor}
+                         . "><td>$ancestor</td></tr>";
+               }
+               print "</table>";
+       }
+       print "</div>";
+}
+
 sub prepare_text {
        my $t = $_[0];
        chomp $t;
@@ -189,11 +241,11 @@ sub buildAncestry {    # recursive
 
                $ancestryTree = $xmltree;
        }
-       
-       my $counter=1;
-       for my $file (reverse(@ancestryList)){
-               $fileLevelHash{$file}=$counter;
-               if ($counter < 6) {
+
+       my $counter = 1;
+       for my $file ( reverse(@ancestryList) ) {
+               $fileLevelHash{$file} = $counter;
+               if ( $counter < 6 ) {
                        $counter++;
                }
        }
@@ -285,23 +337,43 @@ sub del {
        close SCHREIBEN;
 }
 
-sub print_fileSelection {
+sub print_fileSelector{
+       
+       my $configFile = $_[0]; 
+       opendir( DIR, $confDir ) or die $!;
 
-       my $configFile = $_[0];
+       print '<select name="fileSelectionDropdown" id="fileSelector" >';
 
-       print "<table>";
-       print "<tr>";
-       print "<td>select config file:<td>";
-       print "</tr>";
+       print "<option value='...'>...</option>";
+       my @xmlfiles;
+       while ( my $file = readdir(DIR) ) {
 
-       print "<tr>";
+               # Use a regular expression to ignore files beginning with a period
+               next if ( $file =~ m/^\./ );
 
-       print "<td>";
-       opendir( DIR, $confDir ) or die $!;
+               if ( $file =~ m/\.xml$/ ) {
+                       push( @xmlfiles, $file );
+               }
+       }
+       for my $file ( sort @xmlfiles ) {
+               print '<option value="' . $file . '"';
+               if ( $file eq $configFile ) {
+                       print ' selected ';
+               }
+               print '>' . $file . '</option>';
+       }
+       closedir(DIR);
 
-       print '<select name="fileSelectionDropdown" id="fileSelector" >';
+       print '</select>';
+}
+
+sub print_specSelector{
+       
+       my $configFile = $_[0]; 
+       opendir( DIR, $specDir ) or die $!;
+
+       print '<select name="specSelectionDropdown" id="specSelector" >';
 
-       print "<option value='...'>...</option>";
        my @xmlfiles;
        while ( my $file = readdir(DIR) ) {
 
@@ -322,6 +394,22 @@ sub print_fileSelection {
        closedir(DIR);
 
        print '</select>';
+}
+sub print_fileSelection {
+
+       my $configFile = $_[0];
+
+       print "<table>";
+       print "<tr><td>";
+       print "<table>";
+       print "<tr>";
+       print "<td>select config file:<td>";
+       print "</tr>";
+
+       print "<tr>";
+
+       print "<td>";
+       print_fileSelector($configFile);
        print "</td>";
 
        print "<td>";
@@ -333,11 +421,28 @@ sub print_fileSelection {
 
        print "</table>";
 
+       print "</td>";
+       
+       print "<td style='border-right:1px solid #000000'><br></td>";   
+       
+       print "<td>";
        print "<table>";
-       print "<tr><td>";
-       print "selected config file: $configFile";
+       print "<tr><td colspan=2>";
+       print "create new config file:";
        print "</td></tr>";
+
+       print "<tr><td>";
+       print "<input type='text' value='' id='newFileName'>";
+       print "</td><td>";
+       print_specSelector();
+       print "</td><td>";
+       print
+"<input type='button' onclick='createFile()' value='create file' class='stdbutton'>";
+       print "</td></tr>";     
+       
        print "</table>";
+       print "</td>";
+       print "</tr></table>";
 }
 
 sub changeAncestor {
@@ -450,11 +555,11 @@ sub printHash {
 #              "#CCFFCC", "#CCFFFF", "#CCCCFF", "#FFCCFF",
 #              "#FFCCCC", "#FFFFCC", "#FFFFFF"
 #      );
-#      
+#
 #      my @ancestryWithChild;
 #      push(@ancestryWithChild,@ancestryList);
 #      push(@ancestryWithChild,$setfileName);
-#      
+#
 #      my $index=0;
 #      for my $fileName (reverse(@ancestryWithChild)){
 #              $fieldColorHash{$fileName}= $fieldColors[$index];
@@ -462,7 +567,7 @@ sub printHash {
 #                      $index++;
 #              }
 #      }
-#      
+#
 #}
 
 sub print_registers {
@@ -562,7 +667,7 @@ sub print_fields {
                        $readOnlyFlag = 1;
                }
 
-               print "<tr class='fileLevel".$fileLevelHash{$isHeritageFrom}."'>";
+               print "<tr class='fileLevel" . $fileLevelHash{$isHeritageFrom} . "'>";
                print "<td width=120 title=\"$fieldDescr\"";
                print ">$fieldName</td>";
                print "<td> &nbsp;=&nbsp;</td>";
@@ -650,12 +755,35 @@ else {
 }
 }
 
+function selectedSpecFile(){
+if(document.getElementById("specSelector")){
+var e = document.getElementById("specSelector");
+return e.options[e.selectedIndex].text;}
+else {
+       return "";
+}
+}
+
+function newFileName(){
+if(document.getElementById("newFileName")){
+       var fileName = document.getElementById("newFileName").value;
+       var patt = /\.xml/i;
+       if(patt.test(fileName)){
+       return fileName;
+       } else {
+               return fileName+".xml";
+       }
+} else {
+       return "";
+}
+}
 
 var visHash= new Object();
 
 
 function reloadSpecTree(){
-getdata('$me?print=spectree&configFile='+selectedConfigFile(),'roterBereich',false);
+var file_ = encodeURIComponent(selectedConfigFile());
+getdata('$me?print=spectree&configFile='+file_,'roterBereich',false);
 for (var key in visHash) {
 if(visHash[key]==true){
 showElement(key);
@@ -664,7 +792,8 @@ showElement(key);
 }
 
 function reloadSetTree(){
-getdata('$me?print=settree&configFile='+selectedConfigFile(),'blauerBereich',false);
+var file_ = encodeURIComponent(selectedConfigFile());
+getdata('$me?print=settree&configFile='+file_,'blauerBereich',false);
 for (var key in visHash) {
 if(visHash[key]==true){
 showElement(key);
@@ -675,12 +804,23 @@ showElement(key);
 
 function loadFile(){
 debugOutput("load data from "+selectedConfigFile());
+visHash = new Object();
 reloadSpecTree();
 reloadSetTree();
 reloadFileSelection();
        
 }
 
+function createFile(){
+       debugOutput("NewFileName: "+newFileName());
+       var configFile_ = encodeURIComponent(newFileName());
+       var specFile_ = encodeURIComponent(selectedSpecFile());
+       getdata("$me?action=createFile&configFile="+configFile_+"&specFile="+specFile_,"debug",false);
+       getdata('$me?print=fileSelection&configFile='+configFile_,'fileSelection',false);
+       loadFile();
+
+}
+
 function reloadFileSelection(){
 var file_ = encodeURIComponent(selectedConfigFile());
 getdata('$me?print=fileSelection&configFile='+file_,'fileSelection',false);