Changeset 27329 for main/trunk/greenstone2/perllib/lucenebuildproc.pm

Timestamp:

2013-05-14T11:11:21+12:00 (11 years ago)

Author:

kjdon

Message:

changes to match mgpp's shortname mapping stuff. Changed some util functions to FileUtil functions

File:

• main/trunk/greenstone2/perllib/lucenebuildproc.pm (modified) (9 diffs)

main/trunk/greenstone2/perllib/lucenebuildproc.pm

@@ -96 +96 @@
     my $lsec_level = $levels->{'section'};
 
-    # gs2_id should be depricated #####
-    my $gs2_id = "";
-    if ($ldoc_level)
-    {
-    if ($self->{'db_level'} eq 'document')
-    {
-        $gs2_id = $self->{'num_docs'};
-    }
-        else
-    {
-        # default is section level
-        $gs2_id = $self->{'num_sections'} + 1;
-    }
-    }
     my $gs2_docOID = $doc_obj->get_OID();
     my $documenttag = undef;
     my $documentendtag = undef;
 
-    #$documenttag = "<$doc_tag_name xmlns:gs2=\"http://www.greenstone.org/gs2\" file=\"$file\" gs2:id=\"$gs2_id\" gs2:docOID=\"$gs2_docOID\" gs2:mode=\"$edit_mode\">\n";
     $documenttag = "<$doc_tag_name xmlns:gs2=\"http://www.greenstone.org/gs2\" file=\"$file\"  gs2:docOID=\"$gs2_docOID\" gs2:mode=\"$edit_mode\">\n";
     $documentendtag = "\n</$doc_tag_name>\n";
@@ -146 +131 @@
     if (($indexed_doc == 0) || ($indexed_section ne "indexed_section" && $indexed_section ne "indexed_doc")) {
         if ($sec_tag_name ne "") {
-        #$text .= "\n<$sec_tag_name gs2:id=\"$sec_gs2_id\" gs2:docOID=\"$sec_gs2_docOID\" gs2:mode=\"ignore\">\n";
         $text .= "\n<$sec_tag_name  gs2:docOID=\"$sec_gs2_docOID\" gs2:mode=\"ignore\">\n";
         $text .= "\n</$sec_tag_name>\n" 
@@ -156 +140 @@
     if ($sec_tag_name ne "")
     {
-        #$text .= "\n<$sec_tag_name gs2:id=\"$sec_gs2_id\" gs2:docOID=\"$sec_gs2_docOID\" gs2:mode=\"$edit_mode\">\n";
         $text .= "\n<$sec_tag_name  gs2:docOID=\"$sec_gs2_docOID\" gs2:mode=\"$edit_mode\">\n";
     }
@@ -200 +183 @@
         my $shortname="";
         my $new_field = 0; # have we found a new field name?
-        if (defined $self->{'indexfieldmap'}->{$real_field}) {
-        $shortname = $self->{'indexfieldmap'}->{$real_field};
-        }
-        else {
+        if (defined $self->{'fieldnamemap'}->{$real_field}) {
+        $shortname = $self->{'fieldnamemap'}->{$real_field};
+        } else {
         $shortname = $self->create_shortname($real_field);
-        $new_field = 1;
-        }
-
+        $self->{'fieldnamemap'}->{$real_field} = $shortname;
+        $self->{'fieldnamemap'}->{$shortname} = 1;
+        }
         my @metadata_list = (); # put any metadata values in here
         my $section_text = ""; # put the text in here
@@ -260 +242 @@
             # add the tag
             $new_text = "<$shortname index=\"1\">$new_text</$shortname>";
+            $self->{'allindexfields'}->{$real_field} = 1;
         }
         # filter the text
@@ -271 +254 @@
             # delete
             $self->{'num_processed_bytes'} -= length ($new_text);
-        }
-        
-
-        if ($self->{'indexing_text'} && $new_field) {
-            # we need to add to the list in indexfields
-            
-            $self->{'indexfieldmap'}->{$real_field} = $shortname;
-            $self->{'indexfieldmap'}->{$shortname} = 1;
-        }
-        
+        }       
         }
         
@@ -302 +276 @@
         &ghtml::htmlsafe($mvalue);
         
-        if (defined $self->{'indexfieldmap'}->{$mfield}) {
-            $shortname = $self->{'indexfieldmap'}->{$mfield};
+        if (defined $self->{'fieldnamemap'}->{$mfield}) {
+            $shortname = $self->{'fieldnamemap'}->{$mfield};
         }
         else {
             $shortname = $self->create_shortname($mfield);
-            $self->{'indexfieldmap'}->{$mfield} = $shortname;
-            $self->{'indexfieldmap'}->{$shortname} = 1;
-        }      
+            $self->{'fieldnamemap'}->{$mfield} = $shortname;
+            $self->{'fieldnamemap'}->{$shortname} = 1;
+        }
+        $self->{'allindexfields'}->{$mfield} = 1;
         $new_text .= "<$shortname index=\"1\">$mvalue</$shortname>\n";
         if ($allfields_index) {
@@ -315 +290 @@
         }
 
-        if (!defined $self->{'indexfields'}->{$mfield}) {
-            $self->{'indexfields'}->{$mfield} = 1;
+        if (!defined $self->{'extraindexfields'}->{$mfield}) {
+            $self->{'extraindexfields'}->{$mfield} = 1;
         }                   
         
@@ -334 +309 @@
 
     if ($allfields_index) {
-        # add the index name mapping
-        $self->{'indexfieldmap'}->{"allfields"} = "ZZ";
-        $self->{'indexfieldmap'}->{"ZZ"} = 1;
         
         my $new_text = "<ZZ index=\"1\">$allfields_text</ZZ>\n";