Changeset 24404 for main/trunk/greenstone2/perllib/basebuildproc.pm

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).

File:

• main/trunk/greenstone2/perllib/basebuildproc.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/basebuildproc.pm

@@ -244 +244 @@
     my $self = shift (@_);
     my ($lang_meta, $langarr) = @_;
-    $lang_meta =~ s/^ex\.//; # strip ex. if there
+    $lang_meta =~ s/^ex\.([^.]+)$/$1/; # strip any ex. namespace iff it's the only namespace prefix (will leave ex.dc.* intact)
+
     $self->{'lang_meta'} = $lang_meta;
     $self->{'langarr'} = $langarr;
@@ -512 +513 @@
         $value =~ s/\n/\\n/g;
         $value =~ s/\r/\\r/g;
-        # remove ex. if there
-        $field =~ s/^ex\.//;
+        # remove any ex. iff it's the only namespace prefix (will leave ex.dc.* intact)
+        $field =~ s/^ex\.([^.]+)$/$1/; # $field =~ s/^ex\.//; 
 
         # special case for UTF8URL metadata
@@ -696 +697 @@
         }
         else {
-        $field =~ s/^ex\.//; #strip ex. if present
+        $field =~ s/^ex\.([^.]+)$/$1/; # remove any ex. iff it's the only namespace prefix (will leave ex.dc.* intact)
         @metadata_values = @{$doc_obj->get_metadata($doc_obj->get_top_section(), $field)};
         }