Changeset 3195

Timestamp:

2002-06-26T09:55:21+12:00 (22 years ago)

Author:

kjdon

Message:

create_shortname (turns a long metadata name into 2 char name) changed to ignore non-letdigs.

File:

• trunk/gsdl/perllib/mgppbuildproc.pm (modified) (2 diffs)

trunk/gsdl/perllib/mgppbuildproc.pm

@@ -645 +645 @@
 }
 
+#chooses the first two letters or digits for the shortname
+#now ignores non-letdig characters
 sub create_shortname {
     $self = shift(@_);
@@ -650 +652 @@
     my ($realname) = @_;
     #take the first two chars
-    my ($shortname) = $realname =~ /^(\w\w)/;
+    my $shortname;
+    if ($realname =~ /^[^\w]*(\w)[^\w]*(\w)/) {
+    $shortname = "$1$2";
+    } else {
+    # there aren't two letdig's in the field - try arbitrary combinations
+    $realname = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    $shortname = "AB";
+    }
     $shortname =~ tr/a-z/A-Z/;
 
-    #if already used, take the first and third letters and so on
+    #if already used, take the first and third letdigs and so on
     $count = 1;
     while (defined $self->{'indexfieldmap'}->{$shortname}) {
-    if ($realname =~ /^(\w).{$count}(\w)/) {
-        $shortname = "$1$2";
-    $count++;
-    $shortname =~ tr/a-z/A-Z/;
+    if ($realname =~ /^[^\w]*(\w)([^\w]*\w){$count}[^\w]*(\w)/) {
+        $shortname = "$1$3";
+        $count++;
+        $shortname =~ tr/a-z/A-Z/;
     
     }
     else {
-        $realname =~ s/^.//;
+        #remove up to and incl the first letdig
+        $realname =~ s/^[^\w]*\w//;
         $count = 0;
     }