Changeset 33369 for main/trunk/greenstone2/perllib/lucenebuildproc.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/lucenebuildproc.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/lucenebuildproc.pm

@@ -216 +216 @@
         my $shortname="";
         my $new_field = 0; # have we found a new field name?
-        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;
-        }
+        $shortname = $self->get_or_create_shortname($real_field);
         my @metadata_list = (); # put any metadata values in here
         my $section_text = ""; # put the text in here
@@ -322 +316 @@
         &ghtml::htmlsafe($mvalue);
         
-        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 .= "<$shortname index=\"1\">$mvalue</$shortname>\n";
@@ -376 +363 @@
         # ignore special field rank
         next if ($sfield eq "rank" || $sfield eq "none");
-        my $sf_shortname;
-        if (defined $self->{'sortfieldnamemap'}->{$sfield}) {
-        $sf_shortname = $self->{'sortfieldnamemap'}->{$sfield};
-        }
-        else {
-        $sf_shortname = $self->create_sortfield_shortname($sfield);
-        $self->{'sortfieldnamemap'}->{$sfield} = $sf_shortname;
-        $self->{'sortfieldnamemap'}->{$sf_shortname} = 1;
-        }
+        my $sf_shortname = $self->get_or_create_sortfield_shortname($sfield);
+     
         my @metadata_list = (); # put any metadata values in here
         foreach my $submeta (split /,/, $sfield) {
@@ -397 +377 @@
         push (@metadata_list, @section_metadata);
         }
-        # my $new_text = "";
-        # foreach my $item (@metadata_list) {
-        # &ghtml::htmlsafe($item);
-        # $new_text .= "$item"; # should be .="$item "; But will be commenting out and rewriting this entire thing, so it doesn't matter
-        # }
-        # if ($new_text =~ /\S/) {
-        # $new_text = "<$sf_shortname index=\"1\" tokenize=\"0\">$new_text</$sf_shortname>";
-        # # filter the text???
-        # $text .= "$new_text"; # add it to the main text block
-        # $self->{'actualsortfields'}->{$sfield} = 1;
-        # }
         
-        foreach my $item (@metadata_list) {
-            &ghtml::htmlsafe($item);
-            if ($item =~ /\S/) {
-                $item = "<$sf_shortname index=\"1\" tokenize=\"0\">$item</$sf_shortname>";
-                $text .= "$item"; # add it to the main text block
-            }
-        }
-        if(scalar @metadata_list > 0) {
-            $self->{'actualsortfields'}->{$sfield} = 1;
+        my $new_text = "";
+        foreach my $item (@metadata_list) {
+        &ghtml::htmlsafe($item);
+        $new_text .= "$item ";
+        }
+        if ($new_text =~ /\S/) {
+        $new_text = "<$sf_shortname index=\"1\" tokenize=\"0\">$new_text</$sf_shortname>";
+        $text .= "$new_text"; # add it to the main text block
+        $self->{'actualsortfields'}->{$sfield} = 1;
         }
     }
@@ -658 +627 @@
 }
 
-sub create_sortfield_shortname {
+sub get_or_create_sortfield_shortname {
     my $self = shift(@_);
 
     my ($realname) = @_;
-
-    my $index_shortname;
-    # if we have created a shortname for an index on this field, then use it.
-    if (defined $self->{'fieldnamemap'}->{$realname}) {
-    $index_shortname = $self->{'fieldnamemap'}->{$realname};
-    } else {
-    $index_shortname = $self->create_shortname($realname);
+    
+    if (defined $self->{'sortfieldnamemap'}->{$realname}) {
+    return $self->{'sortfieldnamemap'}->{$realname};
     }
-    return "by".$index_shortname;
+
+    # get the shortname made for this index field
+
+    my $shortname = $self->get_or_create_shortname($realname);
+    $shortname = "by".$shortname;
+
+    $self->{'sortfieldnamemap'}->{$realname} = $shortname;
+    $self->{'sortfieldnamemap'}->{$shortname} = 1;
+    return $shortname;
 }