possible unstable changes due to massive variable renaming in cgistest.pl

diff --git a/xml_spielwiese/Common.pm b/xml_spielwiese/Common.pm
index b3be41d4f93423e4a6bcb57e3c5854c6f5aa339c..ad2115f6d1fd664bccf85eeb35eb6b76dab82eab 100644 (file)
--- a/xml_spielwiese/Common.pm
+++ b/xml_spielwiese/Common.pm
@@ -89,6 +89,21 @@ sub binStr2hexStr {
 }
 
 
+sub getFieldVal {
+
+  my $regStr = $_[0]; # pointer!
+  my $start = $_[1];
+  my $end = $_[2];
+  
+  my $regStrLen = length($$regStr);
+  
+  my $substrStart = $regStrLen-1-$end;
+  my $substrLength = $end-$start+1;
+  
+  return substr $$regStr,$substrStart,$substrLength;
+
+
+}
 
 
 

diff --git a/xml_spielwiese/cgitest.pl b/xml_spielwiese/cgitest.pl
index 5f03d7c1c81f2db22f338dfa62fa1d5f07a5a630..e2d78a20435b661e829ed036ee3c793f4bd4861f 100755 (executable)
--- a/xml_spielwiese/cgitest.pl
+++ b/xml_spielwiese/cgitest.pl
@@ -71,13 +71,13 @@ if ( !keys %cgiHash )
 }
 
 my $parser       = XML::LibXML->new();
-my $specfile     = "";
-my $setfile      = "";
-my $specfileName = "";
-my $setfileName  = "";
-my $spectree;
-my $settree;
-my $setMapsType;
+my $specFile     = "";
+my $configFile      = "";
+my $specFileName = "";
+my $configFileName  = "";
+my $specTree;
+my $configTree;
+my $configMapsType;
 
 my %fileLevelHash;
 
@@ -99,11 +99,11 @@ if ( $cgiHash{'print'} eq 'spectree' ) {
                print "<p>config file does not exist</p>";
                exit;
        }
-       parseSetAndSpec( $cgiHash{'configFile'} );
+       parseConfigAndSpec( $cgiHash{'configFile'} );
        print
-"<div class='ancestorInfo' align='center'>specifications loaded from $specfileName</div>";
+"<div class='ancestorInfo' align='center'>specifications loaded from $specFileName</div>";
 
-       print_registers($specfile);
+       print_registers($specFile);
 }
 
 if ( $cgiHash{'print'} eq 'settree' ) {
@@ -112,16 +112,16 @@ if ( $cgiHash{'print'} eq 'settree' ) {
                print "<p>config file does not exist</p>";
                exit;
        }
-       parseSetAndSpec( $cgiHash{'configFile'} );
-       buildAncestry( $setfileName, "" )
+       parseConfigAndSpec( $cgiHash{'configFile'} );
+       buildAncestry( $configFileName, "" )
          ;    #arg1: target file, # arg2: recursion parent target file
 
        #       assignFieldColors();#obsolete
 
-       $settree = $ancestryTree;    # not so elegant
+       $configTree = $ancestryTree;    # not so elegant
        print_ancestorInfo();
 
-       print_registers($setfile);
+       print_registers($configFile);
 }
 
 if ( defined $cgiHash{'debuginput'} ) {
@@ -132,15 +132,15 @@ if ( defined $cgiHash{'action'} ) {
 
        printHash( \%cgiHash );
        if ( $cgiHash{'action'} eq 'save' ) {
-               parseSet( $cgiHash{'configFile'} );
+               parseConfig( $cgiHash{'configFile'} );
                save( $cgiHash{'register'}, $cgiHash{'field'}, $cgiHash{'value'} );
        }
        if ( $cgiHash{'action'} eq 'delete' ) {
-               parseSet( $cgiHash{'configFile'} );
+               parseConfig( $cgiHash{'configFile'} );
                del( $cgiHash{'register'}, $cgiHash{'field'} );
        }
        if ( $cgiHash{'action'} eq 'copyDefaultRegister' ) {
-               parseSetAndSpec( $cgiHash{'configFile'} );
+               parseConfigAndSpec( $cgiHash{'configFile'} );
                del( $cgiHash{'register'}, "" ); # delete existing register from setfile
                copyDefaultRegister( $cgiHash{'register'} );
        }
@@ -153,7 +153,7 @@ if ( defined $cgiHash{'action'} ) {
        }
 
        if ( $cgiHash{'action'} eq 'changeAncestor' ) {
-               parseSet( $cgiHash{'configFile'} );
+               parseConfig( $cgiHash{'configFile'} );
                changeAncestor( $cgiHash{'newAncestor'} );
        }
 
@@ -241,7 +241,7 @@ EOF
 
        #print "</td></tr></table>";
        print "</td></tr><tr><td>";
-       print "$setfileName";
+       print "$configFileName";
        print "</td></tr></table>";
        print "</div>";
 }
@@ -256,23 +256,23 @@ sub prepare_text {
        return $t;
 }
 
-sub parseSetAndSpec {
-       parseSet( $_[0] );
-       $specfileName = $settree->findvalue("/MAPS/\@specDbFile");
-       $specfile     = $specDir . "/" . $specfileName;
-       unless ( -e $specfile ) {
+sub parseConfigAndSpec {
+       parseConfig( $_[0] );
+       $specFileName = $configTree->findvalue("/MAPS/\@specDbFile");
+       $specFile     = $specDir . "/" . $specFileName;
+       unless ( -e $specFile ) {
                print
-"<p>specification file \"$specfileName\" could not be found in the specification directory \"$specDir\"</p>";
+"<p>specification file \"$specFileName\" could not be found in the specification directory \"$specDir\"</p>";
                exit;
        }
-       $spectree = $parser->parse_file($specfile);
+       $specTree = $parser->parse_file($specFile);
 }
 
-sub parseSet {
-       $setfileName = $_[0];
-       $setfile     = $confDir . "/" . $_[0];
-       $settree     = $parser->parse_file($setfile);
-       $setMapsType = $settree->findvalue("/MAPS/\@type");
+sub parseConfig {
+       $configFileName = $_[0];
+       $configFile     = $confDir . "/" . $_[0];
+       $configTree     = $parser->parse_file($configFile);
+       $configMapsType = $configTree->findvalue("/MAPS/\@type");
 }
 
 sub buildAncestry {    # recursive
@@ -299,7 +299,7 @@ sub buildAncestry {    # recursive
                        print "<p>";
                        print $parentXmlFileName. "->"
                          . join( "->", @ancestryList ) . "->"
-                         . $setfileName;
+                         . $configFileName;
                        print "</p>";
                        print "<p>The faulty include directive was removed.</p>";
                        print
@@ -323,7 +323,7 @@ sub buildAncestry {    # recursive
                  . $xmlfileName
                  . "</strike>" . "->"
                  . join( "->", @ancestryList ) . "->"
-                 . $setfileName;
+                 . $configFileName;
                print "</p>";
                print "<p>The faulty include directive was removed.</p>";
                print "<p><input type='button' onclick='loadFile()' value='back'></p>";
@@ -333,8 +333,8 @@ sub buildAncestry {    # recursive
        }
 
        my $xmltree;
-       if ( $xmlfile eq $setfile ) {
-               $xmltree = $settree;
+       if ( $xmlfile eq $configFile ) {
+               $xmltree = $configTree;
        }
        else {
 
@@ -354,7 +354,7 @@ sub buildAncestry {    # recursive
        my $currentSpecFileName = $xmltree->findvalue("/MAPS/\@specDbFile");
 
        # compliance checking MAPS type
-       unless ( $currentMapsType eq $setMapsType ) {
+       unless ( $currentMapsType eq $configMapsType ) {
                print
 "<p>the included config file does not comply with the MAPS type of the current config file</p>";
                print "<p>The faulty include directive was removed.</p>";
@@ -364,7 +364,7 @@ sub buildAncestry {    # recursive
        }
 
        # compliance checking specDbFile
-       unless ( $currentSpecFileName eq $specfileName ) {
+       unless ( $currentSpecFileName eq $specFileName ) {
                print
 "<p>the included config file is not based on the same specification file as current config file</p>";
                print "<p>The faulty include directive was removed.</p>";
@@ -449,8 +449,8 @@ sub del {
 
        my $registerName = $_[0];
        my $fieldName    = $_[1];
-       my $xmlfile      = $setfile;
-       my $xmltree      = $settree;
+       my $xmlfile      = $configFile;
+       my $xmltree      = $configTree;
        my $maps         = $xmltree->findnodes("/MAPS")->shift();
        my $register     =
          $xmltree->findnodes( "/MAPS/register[\@name='" . $registerName . "']" )
@@ -630,8 +630,8 @@ sub print_fileSelection {
 
 sub changeAncestor {
        my $ancestorFileName = $_[0];
-       my $xmltree          = $settree;
-       my $xmlfile          = $setfile;
+       my $xmltree          = $configTree;
+       my $xmlfile          = $configFile;
        my $maps             = $xmltree->findnodes("/MAPS")->shift();
 
        $maps->setAttribute( "inheritSettingsFrom", $ancestorFileName );
@@ -645,7 +645,7 @@ sub changeAncestor {
 }
 
 sub getAncestor {
-       my $xmltree = $settree;
+       my $xmltree = $configTree;
        return ( $xmltree->findvalue("/MAPS/\@inheritSettingsFrom") || "" );
 }
 
@@ -653,10 +653,10 @@ sub save {
 
        my $registerName = $_[0];
        my $fieldName    = $_[1];
-       my $xmlfile      = $setfile;
+       my $xmlfile      = $configFile;
        my $newValue     = $_[2];
 
-       my $xmltree = $settree;
+       my $xmltree = $configTree;
        my $maps    = $xmltree->findnodes("/MAPS")->shift();
 
 #my @fields = $xmltree->findnodes("/MAPS/register[\@name='".$registerName."']/field[\@name='".$fieldName."']");
@@ -695,32 +695,32 @@ sub save {
 
 sub copyDefaultRegister {
        my $registerName = $_[0];
-       my $settree      = $parser->parse_file($setfile);
-       my $spectree     = $parser->parse_file($specfile);
-       my $setmaps      = $settree->findnodes("/MAPS")->shift();
-       my $specmaps     = $spectree->findnodes("/MAPS")->shift();
+       my $configTree      = $parser->parse_file($configFile);
+       my $specTree     = $parser->parse_file($specFile);
+       my $configmaps      = $configTree->findnodes("/MAPS")->shift();
+       my $specmaps     = $specTree->findnodes("/MAPS")->shift();
 
        my $specRegister =
-         $spectree->findnodes( "/MAPS/register[\@name='" . $registerName . "']" )
+         $specTree->findnodes( "/MAPS/register[\@name='" . $registerName . "']" )
          ->shift();
 
-       my $setRegister = $setmaps->addNewChild( "", "register" );
-       $setRegister->setAttribute( "name", $registerName );
+       my $configRegister = $configmaps->addNewChild( "", "register" );
+       $configRegister->setAttribute( "name", $registerName );
 
        my @specFields = $specRegister->findnodes("./field");
 
        for my $specField (@specFields) {
                my $fieldName  = $specField->findvalue("./\@name");
                my $fieldValue = $specField->findvalue("./\@defaultValue");
-               my $setField   = $setRegister->addNewChild( "", "field" );
-               $setField->setAttribute( "name",  $fieldName );
-               $setField->setAttribute( "value", $fieldValue );
-               print $setField->findvalue("./\@value");
+               my $configField   = $configRegister->addNewChild( "", "field" );
+               $configField->setAttribute( "name",  $fieldName );
+               $configField->setAttribute( "value", $fieldValue );
+               print $configField->findvalue("./\@value");
        }
-       open( SCHREIBEN, "> $setfile" )
-         or print "could not open file $setfile for writing: $!\n";
+       open( SCHREIBEN, "> $configFile" )
+         or print "could not open file $configFile for writing: $!\n";
 
-       print SCHREIBEN $settree->toString();
+       print SCHREIBEN $configTree->toString();
        close SCHREIBEN;
 }
 
@@ -748,7 +748,7 @@ sub printHash {
 #
 #      my @ancestryWithChild;
 #      push(@ancestryWithChild,@ancestryList);
-#      push(@ancestryWithChild,$setfileName);
+#      push(@ancestryWithChild,$configFileName);
 #
 #      my $index=0;
 #      for my $fileName (reverse(@ancestryWithChild)){
@@ -763,18 +763,18 @@ sub printHash {
 sub print_registers {
        my $xmlfile = $_[0];
        my $xmltree;
-       if ( $xmlfile eq $setfile ) {
-               $xmltree = $settree;
+       if ( $xmlfile eq $configFile ) {
+               $xmltree = $configTree;
        }
-       elsif ( $xmlfile eq $specfile ) {
-               $xmltree = $spectree;
+       elsif ( $xmlfile eq $specFile ) {
+               $xmltree = $specTree;
        }
        else {
                die "xmlfile given to sub print_registers is unknown";
        }
        my @registers = sort by_name $xmltree->findnodes("/MAPS/register");
        print "<table class=\"registers\"";
-       if ( $xmlfile eq $setfile ) {
+       if ( $xmlfile eq $configFile ) {
                print "id='configFileRegisters'";
        }
        print ">";
@@ -784,7 +784,7 @@ sub print_registers {
                my $registerId    = $register->findvalue("./\@id");
                my $registerSize  = $register->findvalue("./\@size");
                my $registerDescr = prepare_text(
-                       $spectree->findvalue(
+                       $specTree->findvalue(
                                "/MAPS/register[\@name='" . $registerName . "']/description"
                          )
                          || "n/a"
@@ -801,12 +801,12 @@ EOF
 
                #print "<td>$registerId</td>";
 
-               if ( $xmlfile eq $setfile ) {  # we are printing the Specifications Tree
+               if ( $xmlfile eq $configFile ) {  # we are printing the Specifications Tree
                        print <<EOF;
 <td class='button_move' onclick='deleteSettings("$registerName","");'>&nbsp;X&nbsp;</td>
 EOF
                }
-               if ( $xmlfile eq $specfile ) {    # we are printing the Settings Tree
+               if ( $xmlfile eq $specFile ) {    # we are printing the Settings Tree
 
                        print <<EOF;
 <td class='button_move' onclick='copyDefaultRegister("$registerName");'>&nbsp;&rarr;&nbsp;</td>
@@ -840,14 +840,14 @@ sub print_fields {
                my $readOnlyFlag   = 0;
                my $fieldValue     = $field->findvalue("./\@value");
                my $fieldSize      =
-                 $spectree->findvalue( "/MAPS/register[\@name='"
+                 $specTree->findvalue( "/MAPS/register[\@name='"
                          . $registerName
                          . "']/field[\@name='"
                          . $fieldName
                          . "']/\@size" )
                  || "n/a";
                my $fieldDescr = prepare_text(
-                       $spectree->findvalue(
+                       $specTree->findvalue(
                                    "/MAPS/register[\@name='"
                                  . $registerName
                                  . "']/field[\@name='"
@@ -895,12 +895,12 @@ EOF
                }
 
                print '</td>';
-               if ( $xmlfile eq $specfile ) { # we are printing the Specifications tree
+               if ( $xmlfile eq $specFile ) { # we are printing the Specifications tree
                        print <<EOF;
 <td class='button_move' onclick='saveSettings("$registerName","$fieldName","$fieldValue");'>&nbsp;&rarr;&nbsp;</td>
 EOF
                }
-               if ( $xmlfile eq $setfile ) {    # we are printing the Settings Tree
+               if ( $xmlfile eq $configFile ) {    # we are printing the Settings Tree
 
                        if ( $isHeritageFrom eq "" )
                        {    # these are actual settings, not inherited!

diff --git a/xml_spielwiese/ini2xml.pl b/xml_spielwiese/ini2xml.pl
index 6da51f2b7956692ff16541b6403b94c8321fa6fe..0d7176c43fa71088959a2b19c77483599e69ac32 100755 (executable)
--- a/xml_spielwiese/ini2xml.pl
+++ b/xml_spielwiese/ini2xml.pl
@@ -215,21 +215,6 @@ while (defined(my $line = <READ>)) {
 
 
 
-sub getFieldVal {
-
-  my $regStr = $_[0]; # pointer!
-  my $start = $_[1];
-  my $end = $_[2];
-  
-  my $regStrLen = length($$regStr);
-  
-  my $substrStart = $regStrLen-1-$end;
-  my $substrLength = $end-$start+1;
-  
-  return substr $$regStr,$substrStart,$substrLength;
-
-
-}
 
 
 # sub register2hex {

diff --git a/xml_spielwiese/xml2ini.pl b/xml_spielwiese/xml2ini_old.pl
similarity index 100%
rename from xml_spielwiese/xml2ini.pl
rename to xml_spielwiese/xml2ini_old.pl