From: Michael Wiebusch Date: Fri, 12 Jul 2013 08:48:34 +0000 (+0200) Subject: moved some stuff around, will begin modularisation of subroutines hereafter, make... X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=ca1dfa17d5233f5e6eb20ff833623659fd390ea9;p=mvdsensorcontrol.git moved some stuff around, will begin modularisation of subroutines hereafter, make global variables ours --- diff --git a/tools/jtageditor.pl b/tools/jtageditor.pl index 735bfce..aff6d30 100755 --- a/tools/jtageditor.pl +++ b/tools/jtageditor.pl @@ -8,6 +8,10 @@ print "Content-type: text/html\n\n"; # in copy merge trees from xml2ini.pl # or put it in the common.pm +# correct size in tooltip + +# build ancestry without ancestry tree outside + # DONE # do not include wrong type, different specfile @@ -31,41 +35,7 @@ use HTML::Entities; require Common; -sub initPage { - - print < - -JTAG Editor - - -EOF - printJavaScripts(); - print < - -

JTAG Configuration File Editor

-
-debug text -
-
- -Current File: unknown -
- -
-empty -
-
-empty -
- - - - -EOF -} my %cgiHash = &read_input; @@ -95,6 +65,8 @@ my @ancestryList; my $confDir = '../config'; my $specDir = '../specs'; +# end of global variables + if ( $cgiHash{'print'} eq 'fileSelection' ) { print "
File Selection
"; print_fileSelection( $cgiHash{'configFile'} ); @@ -213,7 +185,6 @@ sub createFile { } - sub parseConfigAndSpec { parseConfig( $_[0] ); $specFileName = $configTree->findvalue("/MAPS/\@specDbFile"); @@ -756,15 +727,48 @@ EOF print ""; } +sub initPage { + print < + +JTAG Editor + + +EOF + printJavaScripts(); + print < + +

JTAG Configuration File Editor

+
+debug text +
+
+ +Current File: unknown +
+ +
+empty +
+
+empty +
+ + + + +EOF + +} ############################### ## general xml tools ############################### -sub mergeTrees -{ # give me two trees, tree1 overwrites everything in tree0 and will consequently be integrated in tree0 +sub mergeTrees { # give me two trees, tree1 overwrites everything in tree0 and will consequently be integrated in tree0 my $tree0 = $_[0]; my $tree1 = $_[1]; @@ -809,7 +813,6 @@ sub mergeTrees } } - sub changeAncestor { my $ancestorFileName = $_[0]; my $xmltree = $configTree; @@ -848,8 +851,6 @@ sub prepare_text { return $t; } - - sub save { my $registerName = $_[0]; @@ -941,8 +942,6 @@ sub printHash { } - - sub read_input { my $buffer; my @pairs;