Changeset 24404 for main/trunk/greenstone2/perllib/plugins

Timestamp:

2011-08-12T19:35:50+12:00 (13 years ago)

Author:

ak19

Message:

Changes to perl code to do with removing the ex. prefix: ex. is only removed if it is the sole prefix (i.e. ex.dc.* prefixes are not removed).

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• BasePlugin.pm (modified) (1 diff)
• EmbeddedMetadataPlugin.pm (modified) (2 diffs)
• OAIPlugin.pm (modified) (2 diffs)

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

@@ -204 +204 @@
     $self->{'plugin_type'} = $plugin_name;
 
-    # remove ex. from OIDmetadata
-    $self->{'OIDmetadata'} =~ s/^ex\.// if defined $self->{'OIDmetadata'};
+    # remove ex. from OIDmetadata iff it's the only namespace prefix
+    $self->{'OIDmetadata'} =~ s/^ex\.([^.]+)$/$1/ if defined $self->{'OIDmetadata'};
     $self->{'num_processed'} = 0;
     $self->{'num_not_processed'} = 0;

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

@@ -287 +287 @@
 
 
-sub metadata_read()
+sub metadata_read
 {
     my $self = shift (@_);
@@ -314 +314 @@
 }
 
-sub process()
+sub process
 {
     # not used

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

@@ -90 +90 @@
     return bless $self, $class;
     }
-    # trim ex. from document field (if there)
-    $self->{'document_field'} =~ s/^ex\.//;
+    # trim any ex. from document field iff it's the only metadata namespace prefix    
+    $self->{'document_field'} =~ s/^ex\.([^.]+)$/$1/;
     return bless $self, $class;
 }
@@ -531 +531 @@
 
         # so that GLI can see this metadata, store here as ex.dc.Title etc
-        my $ex_metaname = "ex.$metaname";
+        my $ex_metaname = $metaname;
+        $ex_metaname =~ s/^ex\.//; # remove any pre-existing ex. prefix
+        $ex_metaname = "ex.$ex_metaname"; # at last can prefix ex.
 
         if (defined $metadata->{$ex_metaname})