Changeset 11296

Timestamp:

2006-03-01T15:29:35+13:00 (18 years ago)

Author:

kjdon

Message:

now only use a-z1-9 chars in the index names (\w) in case the names have unicode chars in them

File:

• trunk/gsdl/perllib/basebuilder.pm (modified) (1 diff)

trunk/gsdl/perllib/basebuilder.pm

@@ -453 +453 @@
 # of that componant - otherwise it will contain the first 
 # character of the first two components 
+# only uses letdig (\w) characters now
 sub process_field {
     my $self = shift (@_);
     my ($field) = @_;
- 
-    return "" unless (defined ($field) && $field =~ /\w/);
-
+
+    return "" unless (defined ($field) && $field =~ /\S/);
+    
+    my ($a, $b);
     my @components = split /,/, $field;
     if (scalar @components >= 2) {
-    splice (@components, 2);
-    map {s/^(.).*$/$1/;} @components;
-    return join("", @components);
+    # pick the first letdig from the first two field names
+    ($a) = $components[0] =~ /^[^\w]*(\w)/;
+    ($b) = $components[1] =~ /^[^\w]*(\w)/;
     } else {
-    my ($a, $b) = $field =~ /^(.).*?([bcdfghjklmnpqrstvwxyz])/i;
-    ($a, $b) = $field =~ /^(.)(.)/ unless defined $a && defined $b;
-    return "$a$b";
-    }
+    # pick the first two letdig chars
+    ($a, $b) = $field =~ /^[^\w]*(\w)[^\w]*?(\w)/i;
+    }
+    # there may not have been any letdigs...
+    $a = 'a' unless defined $a;
+    $b = '0' unless defined $b;
+
+    return "$a$b";
+    
 }