Changeset 33429 for main/trunk/greenstone2/perllib/mgppbuildproc.pm

Timestamp:

2019-08-20T11:04:13+12:00 (5 years ago)

Author:

kjdon

Message:

fixed a bug in get_or_create_shortname where it wasn't storing the new shortname against the original name, but against working version. so next time come in there, the real name didn't have a shortname stored, so had to go through the process again. eventually it ran out of letters and hung in an infinite loop

File:

• main/trunk/greenstone2/perllib/mgppbuildproc.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/mgppbuildproc.pm

@@ -404 +404 @@
 sub get_or_create_shortname {
     my $self = shift(@_);
-    
     my ($realname) = @_;
     if (defined $self->{'fieldnamemap'}->{$realname}) {
@@ -420 +419 @@
     } else {
     # we can't use the quick map, so join all fields back together (without namespaces), and try sets of two characters.
-    $realname = join ("", @realnamelist);
+    my $fullname = join ("", @realnamelist);
     #try the first two chars
-    if ($realname =~ /^[^\w]*(\w)[^\w]*(\w)/) {
+    if ($fullname =~ /^[^\w]*(\w)[^\w]*(\w)/) {
         $shortname = "$1$2";
     } else {
         # there aren't two letdig's in the field - try arbitrary combinations
-        $realname = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        $fullname = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
         $shortname = "AB";
     }
@@ -433 +432 @@
     #if already used, take the first and third letdigs and so on
     my $count = 1;
-    while (defined $self->{'fieldnamemap'}->{$shortname} || defined $static_indexfield_map{$shortname}) {
-        if ($realname =~ /^[^\w]*(\w)([^\w]*\w){$count}[^\w]*(\w)/) {
+     while (defined $self->{'fieldnamemap'}->{$shortname} || defined $static_indexfield_map{$shortname}) {
+         if ($fullname =~ /^[^\w]*(\w)([^\w]*\w){$count}[^\w]*(\w)/) {
         $shortname = "$1$3";
         $count++;
@@ -440 +439 @@
         
         }
-        else {
-        #remove up to and incl the first letdig
-        $realname =~ s/^[^\w]*\w//;
+         else {
+         #remove up to and incl the first letdig
+         $fullname =~ s/^[^\w]*\w//;
+         if ($fullname !~ /^[^\w]*(\w)[^\w]*(\w)/) {
+             $fullname = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+         }
         $count = 0;
         }
@@ -451 +453 @@
     $self->{'fieldnamemap'}->{$realname} = $shortname;
     $self->{'fieldnamemap'}->{$shortname} = 1;
-
     return $shortname;
 }