added changeConfigVal.pl

diff --git a/tools/Common.pm b/tools/Common.pm
index 3b845531392ec331845e1cacea2c9974f401f698..555577addd9dbda7d5c96cdf9cc698171b9fd9ae 100644 (file)
--- a/tools/Common.pm
+++ b/tools/Common.pm
@@ -8,6 +8,21 @@
 ## misc utilities
 ###############################
 
+sub getStdIn {
+#write std in into an array and return that
+# if semicola are somewhere, interprete 
+# as newline
+my @userinput = <STDIN>;
+my @userinput_;
+for my $line (@userinput){
+  for my $command (split(";",$line)){
+    $command =~ s/\n//g;
+    push(@userinput_,$command);
+  }
+}
+return @userinput_
+}
+
 sub any2hex {
 
   my $argument = $_[0];

diff --git a/tools/changeConfigVal.pl b/tools/changeConfigVal.pl
new file mode 100755 (executable)
index 0000000..386616a
--- /dev/null
+++ b/tools/changeConfigVal.pl
@@ -0,0 +1,165 @@
+#!/usr/bin/perl -w
+
+use strict;
+use warnings;
+use XML::LibXML;
+use POSIX;
+use Getopt::Long;
+use Pod::Usage;
+
+require Common;
+require xmlOperations;
+
+
+
+# TODO:
+
+# create new file by giving "new" flag + specfile
+# testing ...
+
+
+
+# manage command line options
+my $help=0;
+my $configFile=0;
+#my $specFile=0;
+#my $output=0;
+my $verbose=0;
+my $testblock=0;
+
+Getopt::Long::Configure(qw(gnu_getopt));
+GetOptions(
+           'help|h' => \$help,
+           'verbose|v' => \$verbose,
+           'config|c=s' => \$configFile,
+#           'spec|s=s' => \$specFile,
+#           'output|o=s' => \$output,
+#           'redundant|r' => \$redundant,
+           'testblock|t' => \$testblock
+          ) or pod2usage(2);
+pod2usage(1) if $help;
+###
+
+
+# if verbose flag is set, make verbose filehandle equal STDOUT and not /dev/null
+# which means: if verbose flag is set, then really print the verbose print directives
+unless ($verbose) {
+   open(VERBOSE, '>', "/dev/null") or die;
+} else {
+   *VERBOSE = *STDOUT;
+}
+
+#### room for testblocks ########################################
+
+if($testblock){
+
+
+
+
+}
+#################################################################
+
+
+
+# ini and specfile arguments mandatory!
+unless ($configFile) {
+  pod2usage(1);
+}
+#
+
+
+
+##################################
+
+my $configFileName  = ""; #don't get it confused with $configFileName in xmlOperations.pm
+
+
+###############################
+
+our $confDir = '../config'; # default, gets overwritten anyway
+our $specDir = '../specs';
+
+# separate configFileName and the containing directory path
+my @configFilePath = split("/",$configFile);
+$configFileName = pop(@configFilePath);
+$confDir = join("/",@configFilePath);
+
+print VERBOSE "configFileName: $configFileName\nconfDir: $confDir\n";
+
+# check if file exists
+unless (-e $configFile) {
+  die "config file does not exist!";
+  }
+
+# parse config and spec file
+parseConfigAndSpec( $configFileName );
+
+# no ancestry
+#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";
+
+
+my @inputLines = getStdIn();
+
+for my $line (@inputLines){
+
+  $line =~ m/^\s*([0-9a-zA-Z_]+)\s*\/\s*([0-9a-zA-Z_]+)\s*=\s*([0-9a-zA-Z]+)/;
+  my $register = $1;
+  my $field = $2;
+  my $value = $3;
+  
+  print VERBOSE "changed register $register field $field to $value\n";
+  
+  
+  if (lc($value) eq "default") {
+    if($field eq "*") { 
+      $field = "";
+    }
+    del($register,$field);
+  } else {
+    save($register,$field,$value);
+  }
+
+
+}
+
+print VERBOSE "attempting to write the config file ...\n";
+writeConfigFile();
+print VERBOSE "done\n";
+
+
+
+
+###############################
+#### Feierabend!
+###############################     
+__END__
+
+=head1 NAME
+
+changeConfigVal.pl - set specific values inside a configuration file
+
+=head1 SYNOPSIS
+
+changeConfigVal.pl -c config.xml [-v]
+
+ Options:
+   -h, --help       brief help message
+   -v, --verbose    detailed debugging info about ongoing actions
+   -c, --config     specifies the input config xml file
+
+=back
+
+=head1 DESCRIPTION
+
+=cut

diff --git a/tools/xml2ini.pl b/tools/xml2ini.pl
index cf0188b79e453fa2a5810a01888b0e2e1c0326cc..42825846d519ef74c9118ddce710bdc36311cf7a 100755 (executable)
--- a/tools/xml2ini.pl
+++ b/tools/xml2ini.pl
@@ -6,7 +6,6 @@ use XML::LibXML;
 use POSIX;
 use Getopt::Long;
 use Pod::Usage;
-#use bignum qw/hex/;
 
 require Common;
 require xmlOperations;
@@ -15,16 +14,20 @@ require xmlOperations;
 
 # TODO:
 
-# remove issues with spec file input,
-# it comes with the specDbFileTag anyway!
 
 # pass specification path as argument
 # changeAncestor is not available here, why does it not complain?
 
-# inheriting still not working, something wrong in sub merge trees 420,433
+
 
 
 # done:
+
+# inheriting still not working, something wrong in sub merge trees 420,433
+
+# remove issues with spec file input,
+# it comes with the specDbFileTag anyway!
+
 # recognize confDir from configFile path
 # cast error when field value is too big for field!
 

diff --git a/tools/xmlOperations.pm b/tools/xmlOperations.pm
index d1abb4e820e03aa33a2cc3b103a567fa6290cb53..37274d719a9369f304e852c2b3d6a078b5e39c80 100644 (file)
--- a/tools/xmlOperations.pm
+++ b/tools/xmlOperations.pm
@@ -306,10 +306,10 @@ sub del {
     ->shift();
 
   if ( $fieldName eq "" ) {    # no field specified, remove whole register
-    unless ( $register eq "" ) {
+    if(defined ( $register ) ) {
       $maps->removeChild($register);
     }
-    print "deleted whole register";
+    #print "deleted whole register";
   }
   else {
 
@@ -319,11 +319,15 @@ sub del {
         . "']/field[\@name='"
         . $fieldName
         . "']" )->shift();
-    $register->removeChild($field);
-    print "deleted field<br>";
-    unless ( $register->hasChildNodes() ) {
-      $maps->removeChild($register);
-      print "deleted register as well<br>";
+    if(defined($field)){
+      $register->removeChild($field);
+    }
+    #print "deleted field<br>";
+    if(defined($register)){
+      unless ( $register->hasChildNodes() ) {
+        $maps->removeChild($register);
+        #print "deleted register as well<br>";
+      }
     }
   }
 #   open( SCHREIBEN, "> $xmlfile" )
@@ -351,7 +355,7 @@ sub save {
     $xmltree->findnodes( "/MAPS/register[\@name='" . $registerName . "']" )
     ->shift();
 
-  if ( $register eq "" ) {
+  unless (defined($register) ) {
     $register = $maps->addNewChild( "", "register" );
     $register->setAttribute( "name", $registerName );
   }
@@ -363,14 +367,14 @@ sub save {
       . $fieldName
       . "']" )->shift();
 
-  if ( $field eq "" ) {
+  unless (defined( $field) ) {
     $field = $register->addNewChild( "", "field" );
     $field->setAttribute( "name", $fieldName );
 
   }
 
   $field->setAttribute( "value", $newValue );
-  print $field->findvalue("./\@value");
+  #print $field->findvalue("./\@value");
 #   open( SCHREIBEN, "> $xmlfile" )
 #     or print "could not open file $xmlfile for writing: $!\n";
 #