Changeset 16254

Timestamp:

2008-07-01T10:23:34+12:00 (15 years ago)

Author:

mdewsnip

Message:

Fixed up some crazy XML parsing code and removed unnecessary hard-wiring of the different file types.

File:

• gsdl/trunk/perllib/manifest.pm (modified) (1 diff)

gsdl/trunk/perllib/manifest.pm

@@ -86 +86 @@
 # Called for every start tag. The $_ variable will contain a copy of the
 # tag and the %_ variable will contain the element's attributes.
-sub xml_start_tag {
+sub xml_start_tag
+{
     my $self = shift(@_);
     my ($expat, $element) = @_;
 
-    if ($_ =~ m/^<(Index|Reindex|Delete)>$/) {
-    my $tag = $1;
-    if (defined $self->{'file-type'}) {
-        print STDERR "Warning: Malformed XML manifest.  ";
-        print STDERR "$tag nested inside ", $self->{'file-type'}, "\n";
-        print STDERR "         Changing file-type scope to $tag\n";
+    if ($element eq "Filename")
+    {
+    $self->{'filename'} = "";
+    }
+    else
+    {
+    if (defined($self->{'file-type'}))
+    {
+        print STDERR "Warning: Malformed XML manifest ($element nested inside " . $self->{'file-type'} . ")\n";
     }
 
-    $self->{'file-type'} = lc($tag);
-    }
-    elsif ($_ eq "<Filename>") {
-    $self->{'filename'} = "";
+    $self->{'file-type'} = $element;
     }
 }
 
 # Called for every end tag. The $_ variable will contain a copy of the tag.
-sub xml_end_tag {
+sub xml_end_tag
+{
     my $self = shift(@_);
     my ($expat, $element) = @_;
 
-    if ($_ =~ m/^<\/(Index|Reindex|Delete)>$/) {
+    if ($element eq "Filename")
+    {
+    $self->{lc($self->{'file-type'})}->{$self->{'filename'}} = 1;
+    $self->{'filename'} = undef;
+    }
+    else
+    {
     $self->{'file-type'} = undef;
     }
-    elsif ($_ eq "</Filename>") {
-    my $file_type = $self->{'file-type'};
-    my $filename = $self->{'filename'};
-
-    $self->{$file_type}->{$filename} = 1;
-
-    $self->{'filename'} = undef;
-    }
-
 }