Changeset 24404 for main/trunk/greenstone2/perllib/classify/BaseClassifier.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/classify/BaseClassifier.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/classify/BaseClassifier.pm

@@ -383 +383 @@
     return $metadata unless defined $metadata && $metadata =~ /\S/;
 
-    $metadata =~ s/^ex\.//;
-    $metadata =~ s/([,;:\/])ex\./$1/g;
+    # only remove ex. metadata prefix if there are no other prefixes after it
+    $metadata =~ s/(,|;|:|\/)/$1 /g; # insert a space separator so meta names like flex.Image don't become fl.Image
+    $metadata =~ s/(^| )ex\.([^.,;:\/]+)(,|;|:|\/|$)/$1$2$3/g; 
+                     $metadata =~ s/(,|;|:|\/) /$1/g;
+
     return $metadata;
 }