From 1e8f9e42bbcd6f6a01c2c64b52bf4d6eb1ce51bf Mon Sep 17 00:00:00 2001 From: "www@jspc55" Date: Mon, 30 Jun 2014 14:42:53 +0200 Subject: [PATCH] parsing of setup xml files: renamed top level node to to reduce ambiguity --- tools/run.pl | 2 +- tools/testgui.pl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/run.pl b/tools/run.pl index a1f6b4c..24e3e23 100755 --- a/tools/run.pl +++ b/tools/run.pl @@ -30,7 +30,7 @@ if( $q->param('runtime') ) { #print "Loading detector setup from $setupFile\n"; my $parser = XML::LibXML->new(line_numbers => 1); my $db = $parser->parse_file($setupFile); -my $systemName = $db->findvalue("/DetectorSetup/system/\@name"); +my $systemName = $db->findvalue("/setup/system/\@name"); #print "Loading system description from $systemName\n"; my $systemFile = SYSTEMDIR."/".$systemName.".xml"; $db = $parser->parse_file($systemFile); diff --git a/tools/testgui.pl b/tools/testgui.pl index 89f2ae0..5ce867a 100755 --- a/tools/testgui.pl +++ b/tools/testgui.pl @@ -233,11 +233,11 @@ sub print_setupStructure { unless(defined($setupTree)) { parse_setupFile(); } - my $setup = $setupTree->findnodes("/DetectorSetup")->shift(); - unless(defined($setup)) { die "did not find DetectorSetup node in setup file!\n";} + my $setup = $setupTree->findnodes("/setup")->shift(); + unless(defined($setup)) { die "did not find setup node in setup file!\n";} my $setupDesc = $setup->findvalue("./description"); my $setupName = $setup->findvalue("./\@name"); - $systemName = $setup->findvalue("/DetectorSetup/system/\@name"); + $systemName = $setup->findvalue("/setup/system/\@name"); print h2("Setup: $setupName"); print "

description: $setupDesc

"; -- 2.43.0