Changeset 8740

Timestamp:

2004-12-06T13:57:52+13:00 (19 years ago)

Author:

chi

Message:

Modifications for validated METS format.

File:

• trunk/gsdl/perllib/plugins/METSPlug.pm (modified) (8 diffs)

trunk/gsdl/perllib/plugins/METSPlug.pm

@@ -108 +108 @@
 
     #eval {$self->{'parser_text'}->parse};
-    $self->{'parsed_xml'} = $xml_parser; 
-    }
-}
-
-sub xml_end_document {
-}
-
-sub xml_doctype {
-    my $self = shift(@_);
-
-    my ($expat, $name, $sysid, $pubid, $internal) = @_;
- 
-    # allow the short-lived and badly named "GreenstoneArchive" files to be processed
-    # as well as the "Archive" files which should now be created by import.pl
-    die "" if ($name !~ /^(Greenstone)?Archive$/);
-
+    $self->{'parsed_xml'} = $xml_parser;
+    }
     my $outhandle = $self->{'outhandle'};
     print $outhandle "METSPlug: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
 }
 
+sub xml_end_document {
+}
+
+sub xml_doctype {
+}
+
 sub xml_start_tag {
     my $self = shift(@_);
@@ -133 +125 @@
 
     $self->{'element'} = $element;
-    #print STDERR "###METS Element=$element\n";
 
     #**deal with dmdSection
     if ($element eq "mets:dmdSec" || $element eq "gsdl3:Metadata"){    
     $self->xml_dmd_start_tag (@_);
+    } elsif ($element eq "mets:file") {
+    $_{'ID'} =~ m/FILE(.*)/;
+    $self->{'file_Id'} = $1;
     } elsif ($element eq "mets:FLocat"){
     #***deal with fileSection
-    $self->xml_file_start_tag (@_);
+    $self->xml_fileloc_start_tag (@_);
     } elsif ($element eq "mets:div"){
     #***deal with StrucMap Section
@@ -160 +154 @@
 }
 
-sub xml_file_start_tag {
+sub xml_fileloc_start_tag {
     my $self = shift (@_);
     my ($expat, $element) = @_;
 
     my $xlink = $_{'xlink:href'};
-    my ($section_num) = ($_{'ID'} =~ m/^FILE(.*)$/);
+    #my ($section_num) = ($_{'ID'} =~ m/^FLOCAT(.*)$/);
+    my $section_num = $self->{'file_Id'};
 
     return if (!defined $section_num); 
@@ -190 +185 @@
         my $content_list = $self->{'fileSec_table'}->{"$section_num"};
         push (@$content_list, $section_content);
-        #print STDERR "###Adding the content=$xml_content\n";   
     }
     }
@@ -199 +193 @@
     my ($expat, $element) = @_;
 
-    if ($_{'ID'} ne "All") {
-    my ($section_num) = ($_{'ID'} =~ m/DS(.*)/);
-    
+
+    my ($section_num) = ($_{'ID'} =~ m/DS(.*)/);
+
+    if ($_{'ID'} ne "DSAll"){
     if ($self->{'section_level'}==0) {
         $self->open_document();
@@ -211 +206 @@
     $self->{'section_level'}++;
     
-        #***Add metadata from dmdSection
+    #***Add metadata from dmdSection
     my $md_list = $self->{'dmdSec_table'}->{"$section_num"};
     
@@ -220 +215 @@
     }
     
-        #*** Add content from fileSection
+    #*** Add content from fileSection
     my $content_list = $self->{'fileSec_table'}->{"$section_num"};
-
+    
     foreach my $section_content (@$content_list){
         my $content = $section_content->{'section_content'};
         $self->{'doc_obj'}->add_utf8_text($self->{'section'},$content);
-    }   
+    }
     }
 }
@@ -248 +243 @@
     $self->{'metadata_name'} = "";
     $self->{'metadata_value'} = "";
-    }
+    } elsif ($element eq "mets:file"){
+    $self->{'file_id'} = "";
+    }
+    
     
     #*** StrucMap Section