Some renaming and hopefully fixing attribute access over tied hash

diff --git a/xml-db/database/HUB.xml b/xml-db/database/Hub.xml
similarity index 100%
rename from xml-db/database/HUB.xml
rename to xml-db/database/Hub.xml

diff --git a/xml-db/database/RDO.xml b/xml-db/database/TrgRdo.xml
similarity index 100%
rename from xml-db/database/RDO.xml
rename to xml-db/database/TrgRdo.xml

diff --git a/xml-db/setup/trb-setup-default.xml b/xml-db/setup/trb-setup-default.xml
index 34c0536f595433140dab8068eee1b16dd3bd40fd..30c2ed7cc5632726007c0d3c65392ead533758f6 100644 (file)
--- a/xml-db/setup/trb-setup-default.xml
+++ b/xml-db/setup/trb-setup-default.xml
@@ -66,56 +66,17 @@
     <external ref="PaDiWa" address="0002" />
   </trb>
 
-
-  <!-- An example how to execute a setting. In general, the entities
-       are identified by their type and address (if specified) -->
-  <trb address="0200">
-    <broadcast address="fe48" />
-    <entity ref="TDC">
-      <!-- this field is a bitmask, so there's a converter to easily
-           set single bits -->
-      <field name="ChannelEnable">
-        0-15 => 1, <!-- enables channels 0-15 -->
-        34 => 1, <!-- enables channel 34 -->
-      </field>
-    </entity>
-  </trb>
-
-
-  <trb address="0200">
-    <broadcast address="fe48" />
-      <!-- this field is a bitmask, so there's a converter to easily
-           set single bits -->
-      <entity ref="TDC">
-      <field name="ReadoutFSM">
-        <enumItem value="0">Bla</enumItem>
-      </field>
-      <field name="ChannelEnable">
-        0-15 => 1, <!-- enables channels 0-15 -->
-        34 => 5, <!-- enables channel 34 -->
-      </field>
-    </entity>
-  </trb>
-  
   <trb address="ffff">
-    <entity ref="TrbNet">
+    <entity ref="TrbNet" />
   </trb>
   
   <trb address="fe48">
-    <entity ref="TDC">
-    <entity ref="RDO">
+    <entity ref="TDC" />
+    <entity ref="TrgRdo" />
   </trb>
 
   <trb address="fffe">
-    <entity ref="HUB">
+    <entity ref="Hub" />
   </trb>
-
-<!--
-  <trb address="ff7f">
-    <entity ref="GBE">
-  </trb>
--->
-
-  
-  
+ 
 </TrbNetSetup>

diff --git a/xml-db/xml-db.pl b/xml-db/xml-db.pl
index 70c1ab7e5bfa5eeccdc1624427e4559dd7ea0e32..dee7d6f40747a0f8fc2eb5259236600d97a69540 100755 (executable)
--- a/xml-db/xml-db.pl
+++ b/xml-db/xml-db.pl
@@ -151,9 +151,9 @@ sub EvaluateTrbNode($$$) {
     # and we can check some more required fields
     foreach my $n ($entity->findnodes('//field | //register | //memory | //fifo | //group')) {
       if ($n->nodeName eq 'field') {
-        PrintMessage($n, 'Fatal Error: "start" attribute is required', 0) unless exists $n->{'start'};
+        PrintMessage($n, 'Fatal Error: "start" attribute is required', 1) unless $n->hasAttribute('start');
       } else {
-        PrintMessage($n, 'Fatal Error: "address" attribute is required', 1) unless exists $n->{'address'};
+        PrintMessage($n, 'Fatal Error: "address" attribute is required', 1) unless $n->hasAttribute('address');
       }
     }
   }
@@ -189,10 +189,11 @@ sub MergeElementIntoEntity($$) {
   PrintMessage($elem, "Merging entity item <$uniquename>") if $verbose;
   PrintMessage($elem, "Before merge:\n".$e_node->toString(2)) if $verbose>2;
 
-  # override the attributes (using nice tied hash functionality)
+  # override the attributes (using tied hash functionality, which
+  # sometimes does not work when reading?)
   foreach my $attr (keys %$elem) {
     next if $attr eq 'name';
-    $e_node->setAttribute($attr, $elem->{$attr});
+    $e_node->setAttribute($attr, $elem->getAttribute($attr));
   }
 
   # appending all additional elements