Changeset 13590 for trunk/gsdl/perllib/mgppbuilder.pm

Timestamp:

2007-01-12T14:18:53+13:00 (17 years ago)

Author:

kjdon

Message:

mgpp and lucene. made them always use doc and sec levels for the text regardless of index level specification. mgpp will always index at doc and sec level, but these options may not be presented to the user. this is to ensure that if we have sectioned documents, we don't need to turn on section indexing in order for the document display to use sections

File:

• trunk/gsdl/perllib/mgppbuilder.pm (modified) (10 diffs)

trunk/gsdl/perllib/mgppbuilder.pm

@@ -46 +46 @@
           'Sec'=>'_textsection_',
           'Para'=>'_textparagraph_');
-
-#$doc_level = "Doc";
-#$sec_level = "Sec";
-#$para_level = "Para";
 
 our %wanted_index_files = ('td'=>1,
@@ -127 +123 @@
     }
     
-    $self->{'doc_level'} = "document";
-    if (! $self->{'levels'}->{'document'}) {
-    if ($self->{'levels'}->{'section'}) {
-        $self->{'doc_level'} = "section";
-    } else {
-        die "you must have either document or section level specified!!\n";
-    }
-    }
-
     $self->{'buildtype'} = "mgpp";
 
@@ -229 +216 @@
     # the compressor doesn't need to know about paragraphs - never want to 
     # retrieve them
-    my $mgpp_passes_sections = "";
-    my ($doc_level) = $self->{'doc_level'};
-    $mgpp_passes_sections .= "-J " . $level_map{$doc_level} . " ";
-    foreach my $level (keys %{$self->{'levels'}}) {
-    if ($level ne $doc_level && $level ne "paragraph") {
-        $mgpp_passes_sections .= "-K " . $level_map{$level} . " ";
-    }
-    }
+    
+    # always use Doc and Sec levels
+    my $mgpp_passes_sections = "-J ". $level_map{"document"} ." -K " . $level_map{"section"} ." ";
 
     print $outhandle "\n*** creating the compressed text\n" if ($self->{'verbosity'} >= 1);
@@ -250 +232 @@
     $handle = STDOUT;
     } else {
-    #print $outhandle "trying to run (compress 1) mgpp_passes$exe $mgpp_passes_sections -f \"$fulltextprefix\" -T1 $osextra\n";
     if (!-e "$mgpp_passes_exe" || 
         !open (PIPEOUT, "| mgpp_passes$exe  -M $maxnumeric $mgpp_passes_sections -f \"$fulltextprefix\" -T1 $osextra")) {
@@ -258 +239 @@
     $handle = mgppbuilder::PIPEOUT;
     }
-
-    # gdbm_level
-    my $gdbm_level = "document";
-    if ($self->{'levels'}->{'section'}) {
-    $gdbm_level = "section";
-    }
-    
+    
+    my $gdbm_level = "section";
+
     $self->{'buildproc'}->set_output_handle ($handle);
     $self->{'buildproc'}->set_mode ('text');
@@ -300 +277 @@
 
     if (!$self->{'debug'}) {
-        #print $outhandle "trying to run (compress 2) mgpp_passes$exe $mgpp_passes_sections -f \"$fulltextprefix\" -T2 $osextra\n";
         if (!-e "$mgpp_passes_exe" || 
         !open ($handle, "| mgpp_passes$exe  -M $maxnumeric $mgpp_passes_sections -f \"$fulltextprefix\" -T2 $osextra")) {
@@ -351 +327 @@
     foreach my $index (@$indexes) {
     my ($fields, $subcollection, $languages) = split (":", $index);
-    # the directory name starts with a processed version of index fields
-    #my ($pindex) = $self->process_field($fields);
-    #$pindex = lc ($pindex);
-    # now we only ever have one index, and its called 'idx'
+    
+    # we only ever have one index, and its called 'idx'
     my $pindex = 'idx';
     
@@ -441 +415 @@
 
     # define the section names for mgpasses
-    # define the section names and possibly the doc name for mgpasses
-    my $mgpp_passes_sections = "";
-    my ($doc_level) = $self->{'doc_level'};
-    $mgpp_passes_sections .= "-J " . $level_map{$doc_level} ." ";
-    
-    foreach my $level (keys %{$self->{'levels'}}) {
-    if ($level ne $doc_level) {
-        $mgpp_passes_sections .= "-K " . $level_map{$level}. " ";
-    }
+    my $mgpp_passes_sections = "-J ". $level_map{"document"} ." -K " . $level_map{"section"} ." ";
+    if ($self->{'levels'}->{'paragraph'}) {
+    $mgpp_passes_sections .= "-K " . $level_map{'paragraph'}. " ";
     }
 
@@ -526 +494 @@
     }
         
-    # gdbm_level
-    my $gdbm_level = "document";
-    if ($self->{'levels'}->{'section'}) {
-    $gdbm_level = "section";
-    }
+    # gdbm_level is always section
+    my $gdbm_level = "section";
 
     # set up the document processr
@@ -878 +843 @@
     $build_cfg->{'levelmap'} = \@levelmap;
 
-    if ($self->{'levels'}->{'section'}) {
-    $build_cfg->{'textlevel'} = $level_map{'section'};
-    } else {    
-    $build_cfg->{'textlevel'} = $level_map{'document'};
-    }
+    # text level (and gdbm level) is always section
+    $build_cfg->{'textlevel'} = $level_map{'section'};
    
 }