Better entity loading

diff --git a/xml-db/xml-db.pl b/xml-db/xml-db.pl
index d8ce18090156507cbf40f521ea3a4fcaacaacdbc..2b635ad698d6aa44ae481f931fbdbf6b66d1ba3d 100755 (executable)
--- a/xml-db/xml-db.pl
+++ b/xml-db/xml-db.pl
@@ -149,8 +149,10 @@ sub LoadDBAndFiles {
       my $doc = $parser->parse_file($_);
       ValidateXML($doc, $schemas);
       my $dbname = $doc->getDocumentElement->getAttribute('name');
+      die "File <$_>: Entity with name $dbname already exists in database"
+        if exists $db->{$dbname};
       $db->{$dbname} = $doc;
-      print "Loaded and validated entity <$dbname> from db/$_\n" if $verbose;
+      print "Loaded and validated entity <$dbname> from database <$_>\n" if $verbose;
     }
   }