Changeset 9874 for ps

Timestamp:

07/18/11 16:57:41 (13 years ago)

Author:

philip

Message:

Report XML parse errors better in validator tool

File:

• ps/trunk/source/tools/entity/Entity.pm (modified) (3 diffs)

ps/trunk/source/tools/entity/Entity.pm

@@ -32 +32 @@
 sub load_xml
 {
-    my ($file) = @_;
+    my ($vfspath, $file) = @_;
     my $root = {};
     my @stack = ($root);
@@ -56 +56 @@
         },
     });
-    $p->parse($file);
-
+    eval {
+        $p->parse($file);
+    };
+    if ($@) {
+        die "Error parsing $vfspath: $@";
+    }
     return $root;
 }
@@ -96 +100 @@
 {
     my ($vfspath) = @_;
-    my $layer = load_xml(get_file($vfspath));
+    my $layer = load_xml($vfspath, get_file($vfspath));
 
     if ($layer->{Entity}{'@parent'}) {