From: Andreas Neiser <neiser@kph.uni-mainz.de>
Date: Fri, 23 May 2014 16:00:48 +0000 (+0200)
Subject: Do not encode HTML in unit attribute
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=26ff7bb3fa1ebbdb8373af04fabbfdaa976c048b;p=daqtools.git

Do not encode HTML in unit attribute
---

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 @@
     </memory>
     <register name="Temperature" address="0004">
       <description>Board Temperature</description>
-      <field name="Temperature" start="0" bits="16" format="float" unit="°C" scale=".0625"/>
+      <field name="Temperature" start="0" bits="16" format="float" unit="&#x2103;" scale=".0625"/>
     </register>
     <memory name="CompileTime" address="0110" size="2" width="16">
       <description>Unix timestamp of time of compilation</description>
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 @@
   <group name="StatusRegisters" address="0000" mode="r" >
     <register name="CommonStatus0" address="0000" purpose="status">
       <description>Common Status Register 0</description>
-      <field name="Temperature" start="20" bits="12" format="float" unit="°C" scale=".0625" >
+      <field name="Temperature" start="20" bits="12" format="float" unit="&#x2103;" scale=".0625" >
         <description>Board temperature</description>
       </field>
     </register>
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("<span class=\"tooltip\"><b>$name</b> (Bit $range)<br>raw: 0x%x<br>$cstr</span></div>",$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;
   }