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

Timestamp:

2019-07-29T11:55:01+12:00 (5 years ago)

Author:

kjdon

Message:

instead of create_shortname, now have get_or_create_shortname. this does the working of looking in fieldnamemap to see if a shortname has already been defined, and saving the new shortnames into the map. get_or_create_sortfield_shortname does the same thing with sortfieldnamemap

File:

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

main/trunk/greenstone2/perllib/mgppbuildproc.pm

@@ -298 +298 @@
         my $shortname="";
 
-        if (defined $self->{'fieldnamemap'}->{$real_field}) {
-        $shortname = $self->{'fieldnamemap'}->{$real_field};
-        } else {
-        $shortname = $self->create_shortname($real_field);
-        $self->{'fieldnamemap'}->{$real_field} = $shortname;
-        $self->{'fieldnamemap'}->{$shortname} = 1;
-        }
-
-        my @metadata_list = (); # put any meta values in here
+            $shortname = $self->get_or_create_shortname($real_field);
+        
+            my @metadata_list = (); # put any meta values in here
         my $section_text = ""; # put any text in here
         foreach my $submeta (split /,/, $real_field) {
@@ -381 +375 @@
         next if ($mfield =~ /^gsdl/);
         
-        if (defined $self->{'fieldnamemap'}->{$mfield}) {
-            $shortname = $self->{'fieldnamemap'}->{$mfield};
-        } else {
-            $shortname = $self->create_shortname($mfield);
-            $self->{'fieldnamemap'}->{$mfield} = $shortname;
-            $self->{'fieldnamemap'}->{$shortname} = 1;
-        }
+        $shortname = $self->get_or_create_shortname($mfield);
         $self->{'allindexfields'}->{$mfield} = 1;
         $new_text .= "$paratag<$shortname>$mvalue</$shortname>\n";
@@ -414 +402 @@
 #chooses the first two letters or digits for the shortname
 #now ignores non-letdig characters
-sub create_shortname {
+sub get_or_create_shortname {
     my $self = shift(@_);
     
     my ($realname) = @_;
+    if (defined $self->{'fieldnamemap'}->{$realname}) {
+    return $self->{'fieldnamemap'}->{$realname};
+    }
+
     my @realnamelist = split(",", $realname);
     map {$_=~ s/^[a-zA-Z]+\.//;} @realnamelist; #remove namespaces
@@ -423 +415 @@
 
     # try our predefined static mapping
-    my $name;
-    if (defined ($name = $static_indexfield_map{$singlename})) {
-    if (! defined $self->{'fieldnamemap'}->{$name}) {
-        # has this shortname already been used??
-        return $static_indexfield_map{$singlename};
+    my $shortname;
+    if (defined ($shortname = $static_indexfield_map{$singlename}) && (! defined $self->{'fieldnamemap'}->{$shortname})) {
+    # we have a shortname from the static list, and it hasn't already been used: we can use the shortname
+    } 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);
+    #try the first two chars
+    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 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)/) {
+        $shortname = "$1$3";
+        $count++;
+        $shortname =~ tr/a-z/A-Z/;
+        
+        }
+        else {
+        #remove up to and incl the first letdig
+        $realname =~ s/^[^\w]*\w//;
+        $count = 0;
+        }
     }
     }
-    # we can't use the quick map, so join all fields back together (without namespaces), and try sets of two characters.
-    $realname = join ("", @realnamelist);
-    #try the first two chars
-    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 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)/) {
-        $shortname = "$1$3";
-        $count++;
-        $shortname =~ tr/a-z/A-Z/;
-    
-    }
-    else {
-        #remove up to and incl the first letdig
-        $realname =~ s/^[^\w]*\w//;
-        $count = 0;
-    }
-    }
+    # we now have a new shortname.
+    # store it in fieldnamemap
+    $self->{'fieldnamemap'}->{$realname} = $shortname;
+    $self->{'fieldnamemap'}->{$shortname} = 1;
 
     return $shortname;