Changeset 21803

Timestamp:

17.03.2010 15:48:44 (5 months ago)

Author:

kjdon

Message:

set file_id to null if ID doesn't match FILE.* (previously it was ending up with mets: from the previous match

Files:

• main/trunk/greenstone2/perllib/plugins/GreenstoneMETSPlugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/GreenstoneMETSPlugin.pm

@@ -137 +137 @@
         $self->xml_dmd_start_tag (@_);
     } elsif ($element =~ /^(mets:)?file$/) {
-        $_{'ID'} =~ m/FILE(.*)/;
-        $self->{'file_Id'} = $1;
+        # only store the file_id for sections with text. Not for default ids (assoc files)
+        if ($_{'ID'} =~ m/FILE(.*)/) {
+            $self->{'file_Id'} = $1;
+        }
+        else {
+            undef $self->{'file_Id'};
+        }
     } elsif ($element =~ /^(mets:)?FLocat$/){
         #***deal with fileSection
@@ -173 +178 @@
     my $section_num = $self->{'file_Id'};
     return if (!defined $section_num); 
-    #**return if the section_num is not defined or not deal with the whole section (ID="default.*")
-    
+
     $self->{'fileSec_table'}->{"$section_num"}=[];
     $self->{'fileSec_table'}->{'section_num'}=$section_num;