Changeset 24404 for main/trunk/greenstone2/perllib/doc.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/doc.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/doc.pm

@@ -807 +807 @@
     }
 
-    # Remove the namespace if we are being told to ignore them
+    # Remove any namespace if we are being told to ignore them
     if($ignore_namespace) {
-    $field =~ s/^\w*\.//;
+    $field =~ s/^.*\.//; #$field =~ s/^\w*\.//;
     }
 
@@ -816 +816 @@
     my $data_name = $data->[0];
 
-    # Remove the any namespace if we are being told to ignore them
+    # Remove any namespace if we are being told to ignore them
     if($ignore_namespace) {
-        $data_name =~ s/^\w*\.//;
-    }
-    $data_name =~ s/^ex\.//; # we always remove ex. - it maybe there in doc_obj, but we will never ask for it.
+        $data_name =~ s/^.*\.//; #$data_name =~ s/^\w*\.//;
+    }
+    # we always remove ex. (but not any subsequent namespace) - ex. maybe there in doc_obj, but we will never ask for it.
+    $data_name =~ s/^ex\.([^.]+)$/$1/; #$data_name =~ s/^ex\.//; 
+    
     return $data->[1] if (scalar(@$data) >= 2 && $data_name eq $field);
     }
@@ -842 +844 @@
     }
 
-    # Remove the any namespace if we are being told to ignore them
+    # Remove any namespace if we are being told to ignore them
     if($ignore_namespace) {
-    $field =~ s/^\w*\.//;
+    $field =~ s/^.*\.//;
     }
 
@@ -851 +853 @@
 
     my $data_name = $data->[0];
-    # Remove the any namespace if we are being told to ignore them
+
+    # Remove any namespace if we are being told to ignore them
     if($ignore_namespace) {
-        $data_name =~ s/^\w*\.//;
-    }
-    $data_name =~ s/^ex\.//; # we always remove ex. - it maybe there in doc_obj, but we will never ask for it.
+        $data_name =~ s/^.*\.//;
+    }   
+    # we always remove ex. (but not any subsequent namespace) - ex. maybe there in doc_obj, but we will never ask for it.
+    $data_name =~ s/^ex\.([^.]+)$/$1/;
+
         push (@metadata, $data->[1]) if ($data_name eq $field);
     }