Changeset 17054

Timestamp:

2008-08-28T13:18:10+12:00 (16 years ago)

Author:

kjdon

Message:

a previous change to ReadXMLFile meant that all namespaces were stripped out of the parsed XML. Have modified all the element name tests to use regular expressions with the namespace optional

File:

• gsdl/trunk/perllib/plugins/GreenstoneMETSPlugin.pm (modified) (9 diffs)

gsdl/trunk/perllib/plugins/GreenstoneMETSPlugin.pm

@@ -132 +132 @@
     my $self = shift(@_);
     my ($expat, $element) = @_;
-
     $self->{'element'} = $element;
-
     #**deal with dmdSection
-    if ($element eq "mets:dmdSec" || $element eq "gsdl3:Metadata"){    
+    if ($element =~ /^(mets:)?dmdSec$/ || $element =~ /(gsdl3:)?Metadata$/){ 
     $self->xml_dmd_start_tag (@_);
-    } elsif ($element eq "mets:file") {
+    } elsif ($element =~ /^(mets:)?file$/) {
     $_{'ID'} =~ m/FILE(.*)/;
     $self->{'file_Id'} = $1;
-    } elsif ($element eq "mets:FLocat"){
+    } elsif ($element =~ /^(mets:)?FLocat$/){
     #***deal with fileSection
     $self->xml_fileloc_start_tag (@_);
-    } elsif ($element eq "mets:div"){
+    } elsif ($element =~ /^(mets:)?div$/){
     #***deal with StrucMap Section
     $self->xml_strucMap_start_tag (@_);
@@ -154 +152 @@
     my ($expat, $element) = @_;
 
-    if ($element eq "mets:dmdSec"){
+    if ($element =~ /^(mets:)?dmdSec$/){
     my ($section_num) = ($_{'ID'} =~ m/DM(.*)/);
     $self->{'dmdSec_table'}->{"$section_num"}=[];
     $self->{'dmdSec_table'}->{'section_num'}=$section_num;
-    } elsif ($element eq "gsdl3:Metadata") {
+    } elsif ($element =~ /^(gsdl3:)?Metadata$/) {
     $self->{'metadata_name'} = $_{'name'};
     }
@@ -168 +166 @@
 
     my $xlink = $_{'xlink:href'};
+    if (!defined $xlink) {
+    # try without namespace
+    $xlink = $_{'href'};
+    }
     #my ($section_num) = ($_{'ID'} =~ m/^FLOCAT(.*)$/);
     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.*")
@@ -178 +179 @@
     
     my ($filename,$xpath_expr)=($xlink =~ m/^file:(.*)\#xpointer\((.*)\)$/);
-    
     my $nodeset = $self->{'parsed_xml'}->findnodes ($xpath_expr);
     my $node_size= $nodeset->size;
@@ -189 +189 @@
         my $xml_content = XML::XPath::XMLParser::as_string($node);
         my $unescaped_xml_content = &ghtml::unescape_html($xml_content);
-
         my $section_content={'section_content'=> $unescaped_xml_content};
         
@@ -244 +243 @@
     my ($expat, $element) = @_;
 
-    if ($element eq "gsdl3:Metadata") {
+    if ($element =~ /^(gsdl3:)?Metadata$/) {
     my $section_num = $self->{'dmdSec_table'}->{'section_num'};
     my $metadata_name=$self->{'metadata_name'};
@@ -258 +257 @@
     $self->{'metadata_name'} = "";
     $self->{'metadata_value'} = "";
-    } elsif ($element eq "mets:file"){
+    } elsif ($element =~ /^(mets:)?file$/){
     $self->{'file_id'} = "";
     }
@@ -264 +263 @@
     
     #*** StrucMap Section
-    if ($element eq "mets:div") {
+    if ($element =~ /^(mets:)?div$/) {
     $self->{'section_level'}--;
     $self->{'section'} = $self->{'doc_obj'}->get_parent_section($self->{'section'});
@@ -276 +275 @@
     my ($expat) = @_; 
 
-    if ($self->{'element'} eq "gsdl3:Metadata") {
+    if ($self->{'element'} =~ /^(gsdl3:)?Metadata$/) {
     $self->{'metadata_value'} .= $_;
     }