From 7c36b5db99807bcc79706a7b0fe8fa4e09884b12 Mon Sep 17 00:00:00 2001 From: Michael Wiebusch Date: Fri, 26 Jul 2013 14:56:54 +0200 Subject: [PATCH] some changes/additions to testgui.pl --- tools/Common.pm | 19 +++ tools/jtageditor.pl | 18 +-- tools/testgui.js | 0 tools/testgui.pl | 324 +++++++++++++++++++++++++++++++++++++++++- tools/xmlOperation.pl | 22 +-- 5 files changed, 356 insertions(+), 27 deletions(-) create mode 100644 tools/testgui.js diff --git a/tools/Common.pm b/tools/Common.pm index 913be8c..1cccb2f 100644 --- a/tools/Common.pm +++ b/tools/Common.pm @@ -8,6 +8,25 @@ ## misc utilities ############################### +sub prepare_text { + my $t = $_[0]; + chomp $t; + $t = encode_entities($t); + $t =~ s/^\s//; + $t =~ s/^\n//; + $t =~ s/\t//; + return $t; +} + +# a sorting directive for fields and registers +sub by_name { + my $a_name = $a->findvalue("./\@name"); + my $b_name = $b->findvalue("./\@name"); + + return $a_name cmp $b_name; +} + + sub printHash { my $hashref = $_[0]; for my $element ( keys %{$hashref} ) { diff --git a/tools/jtageditor.pl b/tools/jtageditor.pl index aa52e46..5c1a37f 100755 --- a/tools/jtageditor.pl +++ b/tools/jtageditor.pl @@ -4,7 +4,8 @@ print "Content-type: text/html\n\n"; # TODO - +# make jtageditor callable with config file name as CGI +# argument, so editor opens specified config file # what happens when files are not writable? @@ -523,23 +524,8 @@ EOF ############################### -sub prepare_text { - my $t = $_[0]; - chomp $t; - $t = encode_entities($t); - $t =~ s/^\s//; - $t =~ s/^\n//; - $t =~ s/\t//; - return $t; -} -# a sorting directive for fields and registers -sub by_name { - my $a_name = $a->findvalue("./\@name"); - my $b_name = $b->findvalue("./\@name"); - return $a_name cmp $b_name; -} diff --git a/tools/testgui.js b/tools/testgui.js new file mode 100644 index 0000000..e69de29 diff --git a/tools/testgui.pl b/tools/testgui.pl index 8441799..c71f6f8 100755 --- a/tools/testgui.pl +++ b/tools/testgui.pl @@ -9,20 +9,107 @@ use warnings; use XML::LibXML; use POSIX; use CGI ':standard'; -use Cwd; use CGI::Carp qw(fatalsToBrowser); use HTML::Entities; require Common; require xmlOperations; -my $here = getcwd(); + +##### preliminary hardcoded stuff: + +our $setupDir = '../setup'; +our $confDir = '../config'; +our $specDir = '../specs'; + +my $setupFileName = "testsetup.xml"; +my $setupFile = $setupDir.$setupFileName; + +# the file that tells me what fields should be printed in the quick edit area +# for each sensor +my $quickEditMaskFileName = "quickEditMask.xml"; +my $quickEditMaskFile = $confDir."/".$quickEditMaskFileName; + + +#### globals: + +my $quickEditMaskTree; + + +####################### my $q = CGI->new; + + +unless($q->param()) { + #if called without arguments, + init_html(); +} else { + print header; + print start_html( + -title=>'testgui_debug', + -style=>{'src'=>'../layout/styles.css'}, + -script=>{ -type => 'text/javascript', + -src => './testgui.js'}, + ); + #process the arguments + report_param(); + +} + + + + + + + + + +################################## +#### Subs +################################## + + +sub parse_quickEditMaskFile { + my $parser = XML::LibXML->new(); + unless( -e $quickEditMaskFile) { + die "quickEditMaskFile $quickEditMaskFile does not exist!\n"; + } + $quickEditMaskTree = $parser->parse_file($quickEditMaskFile); +} + +sub print_quickEditArea { + + unless(defined($quickEditMaskTree)) { + parse_quickEditMaskFile(); + } + + print ""; + my @fields = $quickEditMaskTree->findnodes("/MAPS/register/field"); + for my $field (@fields) { + print ""; + + + } + print "
"; + print $field->findvalue("./\@name"); + print "
"; + print "print_registers();",br; + parseConfigAndSpec("0.xml"); + integrateAncestry(); + print_registers(getConfigFile()); + + +} + +sub init_html{ + print header; print start_html( -title=>'testgui', --style=>{'src'=>'../layout/styles.css'} +-style=>[{'src'=>'../layout/styles.css'}, +{'src'=>'../layout/jtageditor.css'} +] ); print h2("testgui"); @@ -38,4 +125,235 @@ print ""; print ""; + +print "
"; +print_quickEditArea(); +print "
"; print end_html; + +} + + + + + + + +sub report_param { + print br,br; + print "action ".$q->param('action')." executed with following parameters:",br; + my @params = $q->param(); + print ""; + for (@params) { + print ""; + + } + print "
"; + print escapeHTML($_); + print "="; + print escapeHTML($q->param($_)); + print "
"; + +} + + +#### html output subs ########### +sub print_registers { + + my $configFile = getConfigFile(); + my $specFile = getSpecFile(); + my $configFileName = getConfigFileName(); + my $specFileName = getSpecFileName(); + my $configTree = getConfigTree(); + my $specTree = getSpecTree(); + + my $xmlfile = $_[0]; + my $xmltree; + if ( $xmlfile eq $configFile ) { + $xmltree = $configTree; + } + 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 ""; + + for my $register (@registers) { + + + my $registerName = $register->findvalue("./\@name"); + + # if register not in the mask file, don't print! + unless( $quickEditMaskTree->findnodes("/MAPS/register[\@name='". + $registerName."']")) { + next; + } + + my $registerId = $register->findvalue("./\@id"); + my $registerSize = $register->findvalue("./\@size"); + my $registerDescr = prepare_text( + $specTree->findvalue( + "/MAPS/register[\@name='" . $registerName . "']/description" + ) + || "n/a" + ); + + my $flistid = $xmlfile . "//" . $registerName; + + print ""; + + print < +  +EOF + print ""; + + #print ""; + + if ( $xmlfile eq $configFile ) { # we are printing the Specifications Tree + print < X  +EOF + } + if ( $xmlfile eq $specFile ) { # we are printing the Settings Tree + + print < →  +EOF + } + + print ""; + + #print ""; + + print ''; + print ''; + print '"; + } + print "
$registerName$registerId
'; + print_fields( $xmlfile, $register ); + print ""; + print "
"; +} + + +sub print_fields { + + my $configFile = getConfigFile(); + my $specFile = getSpecFile(); + my $configFileName = getConfigFileName(); + my $specFileName = getSpecFileName(); + my $configTree = getConfigTree(); + my $specTree = getSpecTree(); + + my $register = $_[1]; + my $xmlfile = $_[0]; + my $registerName = $register->findvalue("./\@name"); + my @fields = sort by_name $register->findnodes("./field"); + print ""; + for my $field (@fields) { + + my $fieldName = $field->findvalue("./\@name"); + + # if field not in the mask file, don't print! + unless( $quickEditMaskTree->findnodes("/MAPS/register[\@name='". + $registerName."']/field[\@name='".$fieldName."']")) { + next; + } + + my $isHeritageFrom = $field->findvalue("./\@isHeritageFrom") || ""; + my $readOnlyFlag = 0; + my $fieldValue = $field->findvalue("./\@value"); + my $fieldSize = + $specTree->findvalue( "/MAPS/register[\@name='" + . $registerName + . "']/field[\@name='" + . $fieldName + . "']/\@size" ) + || "n/a"; + my $fieldDescr = prepare_text( + $specTree->findvalue( + "/MAPS/register[\@name='" + . $registerName + . "']/field[\@name='" + . $fieldName + . "']/description" + ) + || "n/a" + ); + + my $maxFieldVal = 2**$fieldSize; + my $sizeInfo = + sprintf( + "Field contains %d bits, possible values: 0-%d (0x0-0x%x)\n\n", + $fieldSize, $maxFieldVal, $maxFieldVal ); + + $fieldDescr = $sizeInfo . $fieldDescr; + + unless ( $isHeritageFrom eq "" ) { + $fieldDescr = + "Field was inherited from $isHeritageFrom\n\n" . $fieldDescr; + } + + my $fieldId = $xmlfile . "//" . $registerName . "/" . $fieldName; + if ( $fieldValue eq "" ) { + $fieldValue = $field->findvalue("./\@defaultValue"); + $readOnlyFlag = 1; + } + + print ""; + print ""; + print ""; + if ($readOnlyFlag) { + print <$fieldValue +EOF + } + else { + print < + + +EOF + + } + + print ''; + if ( $xmlfile eq $specFile ) { # we are printing the Specifications tree + print < →  +EOF + } + if ( $xmlfile eq $configFile ) { # we are printing the Settings Tree + + if ( $isHeritageFrom eq "" ) + { # these are actual settings, not inherited! + print < X  +EOF + } + else { + print ""; + } + } + print ""; + if ( ( any2dec($fieldValue) < 0 ) + or ( any2dec($fieldValue) > $maxFieldVal ) ) + { + print +"" + ; # just debug + } + } + print "
$fieldName  =  X 
!!!Above value not in allowed range!!!
"; + +} + diff --git a/tools/xmlOperation.pl b/tools/xmlOperation.pl index d585cae..dc2c4f8 100755 --- a/tools/xmlOperation.pl +++ b/tools/xmlOperation.pl @@ -60,37 +60,43 @@ if ( defined $q->param('action') ) { parseConfigFile( $q->param('configFile') ); save( $q->param('register'), $q->param('field'), $q->param('value') ); writeConfigFile(); - report_and_quit(); + report_param(); + exit; } if ( $q->param('action') eq 'delete' ) { parseConfigFile( $q->param('configFile') ); del( $q->param('register'), $q->param('field') ); writeConfigFile(); - report_and_quit(); + report_param(); + exit; } if ( $q->param('action') eq 'copyDefaultRegister' ) { parseConfigAndSpec( $q->param('configFile') ); del( $q->param('register'), "" ); # delete existing register from setfile copyDefaultRegister( $q->param('register') ); writeConfigFile(); - report_and_quit(); + report_param(); + exit; } if ( $q->param('action') eq 'createFile' ) { createConfigFile( $q->param('configFile'), $q->param('specFile') ); writeConfigFile(); - report_and_quit(); + report_param(); + exit; } if ( $q->param('action') eq 'deleteFile' ) { deleteFile( $q->param('configFile') ); - report_and_quit(); + report_param(); + exit; } if ( $q->param('action') eq 'changeAncestor' ) { parseConfigFile( $q->param('configFile') ); changeAncestor( $q->param('newAncestor') ); writeConfigFile(); - report_and_quit(); + report_param(); + exit; } } @@ -100,7 +106,7 @@ if ( defined $q->param('action') ) { print end_html; -sub report_and_quit { +sub report_param { print br,br; print "action ".$q->param('action')." executed with following parameters:",br; my @params = $q->param(); @@ -114,5 +120,5 @@ sub report_and_quit { } print ""; - exit; + } -- 2.43.0