From f67eeee0c5862e97d373f8490a4930bf9ce4c204 Mon Sep 17 00:00:00 2001 From: Michael Wiebusch Date: Tue, 16 Jul 2013 22:30:52 +0200 Subject: [PATCH] cleaned up xml2ini a bit --- tools/jtageditor.pl | 3 +- tools/xml2ini.pl | 240 ++++++----------------------------------- tools/xmlOperations.pm | 4 +- 3 files changed, 36 insertions(+), 211 deletions(-) diff --git a/tools/jtageditor.pl b/tools/jtageditor.pl index 3d64e91..64425c7 100755 --- a/tools/jtageditor.pl +++ b/tools/jtageditor.pl @@ -10,8 +10,7 @@ print "Content-type: text/html\n\n"; # what happens when files are not writable? # make sure that error fields are hidden as well! -# in copy merge trees from xml2ini.pl -# or put it in the common.pm + # correct size in tooltip diff --git a/tools/xml2ini.pl b/tools/xml2ini.pl index 18dbb85..ac71705 100755 --- a/tools/xml2ini.pl +++ b/tools/xml2ini.pl @@ -9,6 +9,7 @@ use Pod::Usage; #use bignum qw/hex/; require Common; +require xmlOperations; @@ -98,26 +99,30 @@ unless ($configFile) { - +################################## # paste a lot of stuff/global variables from cgitest.pl -my $parser = XML::LibXML->new(); -# defined earlier -my $specFile = ""; -#my $configFile = ""; -my $specFileName = ""; -my $configFileName = ""; -my $specTree; -my $configTree; -my $configMapsType; - -my %fileLevelHash; +# now obsolete because we use xmlOperations now! + +# my $parser = XML::LibXML->new(); +# # defined earlier +# my $specFile = ""; +# #my $configFile = ""; +# my $specFileName = ""; +my $configFileName = ""; #don't get it confused with $configFileName in xmlOperations.pm +# my $specTree; +# my $configTree; +# my $configMapsType; +# +# my %fileLevelHash; +# +# my $ancestryTree; +# my @ancestryList; -my $ancestryTree; -my @ancestryList; +############################### -my $confDir = '../config'; # default, gets overwritten anyway -my $specDir = '../specs'; +our $confDir = '../config'; # default, gets overwritten anyway +our $specDir = '../specs'; # separate configFileName and the containing directory path my @configFilePath = split("/",$configFile); @@ -131,8 +136,18 @@ print VERBOSE "configFileName: $configFileName\nconfDir: $confDir\n"; # parse config and spec file parseConfigAndSpec( $configFileName ); # parse and integrate all ancestors of configFile into configTree -buildAncestry( $configFileName, "" ); -$configTree = $ancestryTree; # not so elegant, but works +# buildAncestry( $configFileName, "" ); # obsolete use integrateAncestry() now +# $configTree = $ancestryTree; # not so elegant, but works + +integrateAncestry(); + +# now we will need to copy some variables from xmlOperations to here + $configFile = getConfigFile(); + my $specFile = getSpecFile(); + $configFileName = getConfigFileName(); + my $specFileName = getSpecFileName(); + my $configTree = getConfigTree(); + my $specTree = getSpecTree(); print VERBOSE "specFileName: $specFileName\n specDir: $specDir\n"; @@ -245,196 +260,7 @@ for my $specRegister ( @specRegisters){ -###### all my SUBS ########### - -sub parseConfigAndSpec { - parseConfig( $_[0] ); - $specFileName = $configTree->findvalue("/MAPS/\@specDbFile"); - $specFile = $specDir . "/" . $specFileName; - unless ( -e $specFile ) { - print -"

specification file \"$specFileName\" could not be found in the specification directory \"$specDir\"

"; - exit; - } - $specTree = $parser->parse_file($specFile); -} - -sub parseConfig { - $configFileName = $_[0]; - $configFile = $confDir . "/" . $_[0]; - $configTree = $parser->parse_file($configFile); - $configMapsType = $configTree->findvalue("/MAPS/\@type"); -} - -sub buildAncestry { # recursive - my $xmlfileName = $_[0]; - my $parentXmlFileName = $_[1]; - if ( $xmlfileName eq "" ) { - return; - } - - # check if you are not including yourself - if ( $parentXmlFileName eq $xmlfileName ) { - print "

It's a bad idea to try to include yourself!

"; - print "

The faulty include directive was removed.

"; - print "

"; - changeAncestor(""); # break the evil circle where it was closed! - exit; - } - - # check against circular dependencies - for (@ancestryList) { # suppres circular dependencies! - if ( $xmlfileName eq $_ ) { - - print "

No circular includes, please!

"; - print "

"; - print $parentXmlFileName. "->" - . join( "->", @ancestryList ) . "->" - . $configFileName; - print "

"; - print "

The faulty include directive was removed.

"; - print - "

"; - changeAncestor(""); # break the evil circle where it was closed! - exit; - - #die "no circular includes please! $!"; - return; - } - } - - my $xmlfile = $confDir . "/" . $xmlfileName; - - # check if all files in the ancestry really exist! - unless ( -e $xmlfile ) { - - print "

You are trying to include a file that does not exist

"; - print "

"; - print "" - . $xmlfileName - . "" . "->" - . join( "->", @ancestryList ) . "->" - . $configFileName; - print "

"; - print "

The faulty include directive was removed.

"; - print "

"; - changeAncestor(""); # break the evil circle where it was closed! - exit; - return; - } - - my $xmltree; - if ( $xmlfile eq $configFile ) { - $xmltree = $configTree; - } - else { - - # we got an ancestor here, write him to the ancestor list - unshift( @ancestryList, $xmlfileName ); - $xmltree = $parser->parse_file($xmlfile); - - # tag all the fields with an heritage attribute - for my $field ( $xmltree->findnodes("//field") ) { - $field->setAttribute( "isHeritageFrom", "$xmlfileName" ); - } - } - - my $ancestorFileName = $xmltree->findvalue("/MAPS/\@inheritSettingsFrom") - || ""; - my $currentMapsType = $xmltree->findvalue("/MAPS/\@type"); - my $currentSpecFileName = $xmltree->findvalue("/MAPS/\@specDbFile"); - - # compliance checking MAPS type - unless ( $currentMapsType eq $configMapsType ) { - print -"

the included config file does not comply with the MAPS type of the current config file

"; - print "

The faulty include directive was removed.

"; - print "

"; - changeAncestor(""); # break the evil circle where it was closed! - exit; - } - - # compliance checking specDbFile - unless ( $currentSpecFileName eq $specFileName ) { - print -"

the included config file is not based on the same specification file as current config file

"; - print "

The faulty include directive was removed.

"; - print "

"; - changeAncestor(""); # break the evil circle where it was closed! - exit; - } - unless ( $ancestorFileName eq "" ) { - - # this block is executed when an ancestor is found - buildAncestry( $ancestorFileName, $xmlfileName ) - ; # recursion, second argument is the target file from THIS parent recursion call - - #integrate the current tree into the ancestryTree, overwrite older settings - mergeTrees( $ancestryTree, $xmltree ); - } - else { - -# this block is called when you are at the root of the ancestry -> you are THE Father -# begin the ancestry tree - - $ancestryTree = $xmltree; - } - - my $counter = 1; - for my $file ( reverse(@ancestryList) ) { - $fileLevelHash{$file} = $counter; - if ( $counter < 6 ) { - $counter++; - } - } - -} - -sub mergeTrees -{ # give me two trees, tree1 overwrites everything in tree0 and will consequently be integrated in tree0 - my $tree0 = $_[0]; - my $tree1 = $_[1]; - my $maps0 = $tree0->findnodes("/MAPS")->shift(); - my $maps1 = $tree1->findnodes("/MAPS")->shift(); - - my @registers0 = $tree0->findnodes("/MAPS/register"); - my @registers1 = $tree1->findnodes("/MAPS/register"); - - for my $register1 (@registers1) { - my $registerName = $register1->findvalue("./\@name"); - if ( $registerName eq "" ) { - die "registerName in tree1 undefined!"; - } - - # if current register does not exist in tree0, create it - my $register0 = - $maps0->findnodes( "./register[\@name='" . $registerName . "']" ) - ->shift(); - unless( defined($register0) ) { - $register0 = $maps0->addNewChild( "", "register" ); - $register0->setAttribute( "name", $registerName ); - } - - my @fields1 = $register1->findnodes("./field"); - for my $field1 (@fields1) { - my $fieldName = $field1->findvalue("./\@name"); - - # if field with same name exists in tree0/register0 delete it! - my $field0 = - $register0->findnodes( "./field[\@name='" . $fieldName . "']" ) - ->shift(); - if ( defined($field0) ) { - $register0->removeChild($field0); - } - - # copy current field from tree1/register1 to tree0/register0 - - $register0->addChild($field1); - } - - } -} ############################### #### Feierabend! diff --git a/tools/xmlOperations.pm b/tools/xmlOperations.pm index 5a6073e..d1abb4e 100644 --- a/tools/xmlOperations.pm +++ b/tools/xmlOperations.pm @@ -451,7 +451,7 @@ sub mergeTrees { # give me two trees, tree1 overwrites everything in tree0 and w my $register0 = $maps0->findnodes( "./register[\@name='" . $registerName . "']" ) ->shift(); - if ( $register0 eq "" ) { + unless (defined( $register0 ) ) { $register0 = $maps0->addNewChild( "", "register" ); $register0->setAttribute( "name", $registerName ); } @@ -464,7 +464,7 @@ sub mergeTrees { # give me two trees, tree1 overwrites everything in tree0 and w my $field0 = $register0->findnodes( "./field[\@name='" . $fieldName . "']" ) ->shift(); - unless ( $field0 eq "" ) { + if ( defined($field0) ) { $register0->removeChild($field0); } -- 2.43.0