From 26ff7bb3fa1ebbdb8373af04fabbfdaa976c048b Mon Sep 17 00:00:00 2001 From: Andreas Neiser Date: Fri, 23 May 2014 18:00:48 +0200 Subject: [PATCH] Do not encode HTML in unit attribute --- xml-db/database/Padiwa.xml | 2 +- xml-db/database/TrbNet.xml | 2 +- xml-db/get.pl | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/xml-db/database/Padiwa.xml b/xml-db/database/Padiwa.xml index d6b0138..15f1241 100644 --- a/xml-db/database/Padiwa.xml +++ b/xml-db/database/Padiwa.xml @@ -32,7 +32,7 @@ Board Temperature - + Unix timestamp of time of compilation diff --git a/xml-db/database/TrbNet.xml b/xml-db/database/TrbNet.xml index 449b677..048d4be 100644 --- a/xml-db/database/TrbNet.xml +++ b/xml-db/database/TrbNet.xml @@ -10,7 +10,7 @@ Common Status Register 0 - + Board temperature diff --git a/xml-db/get.pl b/xml-db/get.pl index 6fd4fc9..5cbfacb 100755 --- a/xml-db/get.pl +++ b/xml-db/get.pl @@ -4,7 +4,6 @@ use Storable qw(lock_store lock_retrieve); use feature "switch"; use Time::HiRes qw( time usleep ); use CGI::Carp qw(fatalsToBrowser); -use HTML::Entities qw(encode_entities); use if (!defined $ENV{'QUERY_STRING'}), warnings; use if (!defined $ENV{'QUERY_STRING'}), Pod::Usage; @@ -254,7 +253,7 @@ sub FormatPretty { } my $range = $obj->{start}+$obj->{bits}-1; $range .= "..".$obj->{start} if ($obj->{bits}>1); - $ret .= " ".encode_entities($obj->{unit}) if exists $obj->{unit}; + $ret .= " ".$obj->{unit} if exists $obj->{unit}; $ret .= sprintf("$name (Bit $range)
raw: 0x%x
$cstr
",$rawvalue); } @@ -279,7 +278,7 @@ sub FormatPretty { } default {$ret = sprintf("0x%08x",$value);} } - $ret .= " ".encode_entities($obj->{unit}) if exists $obj->{unit}; + $ret .= " ".$obj->{unit} if exists $obj->{unit}; } return $ret; } -- 2.43.0