Changeset 1772

Timestamp:

2000-12-08T12:18:37+13:00 (23 years ago)

Author:

kjm18

Message:

removed Paragraph stuff - now only has Document and Section; added </Document>

tags at end of docs; the metadata fields that are indexed are written to

indexfields line in build.cfg

Location:

trunk/gsdl/perllib

Files:

• mgppbuilder.pm (modified) (7 diffs)
• mgppbuildproc.pm (modified) (5 diffs)

trunk/gsdl/perllib/mgppbuilder.pm

@@ -238 +238 @@
     } else {
     if (!-e "$mg_passes_exe" || 
-        !open (PIPEOUT, "| $mg_passes_exe -K Section -K Paragraph -T1 -I1 -d $fulltextprefix -f $basefilename")) {
+        !open (PIPEOUT, "| $mg_passes_exe -K Section  -T1 -I1 -d $fulltextprefix -f $basefilename")) {
         die "mgppbuilder::compress_text - couldn't run $mg_passes_exe\n";
     }
@@ -284 +284 @@
     if (!$self->{'debug'}) {
     if (!-e "$mg_passes_exe" || 
-        !open ($handle, "| $mg_passes_exe -K Section -K Paragraph -d $fulltextprefix -f $basefilename -T2 -I2")) {
+        !open ($handle, "| $mg_passes_exe -K Section  -d $fulltextprefix -f $basefilename -T2 -I2")) {
         die "mgppbuilder::compress_text - couldn't run $mg_passes_exe\n";
     }
@@ -360 +360 @@
     } else {
     if (!-e "$mg_passes_exe" || 
-        !open (PIPEOUT, "| $mg_passes_exe -K Section -K Paragraph -d $builddir -f $basefilename -T1")) {
+        !open (PIPEOUT, "| $mg_passes_exe -K Section  -d $builddir -f $basefilename -T1")) {
         die "mgppbuilder::compress_text - couldn't run $mg_passes_exe\n";
     }
@@ -396 +396 @@
     if (!$self->{'debug'}) {
         if (!-e "$mg_passes_exe" || 
-        !open ($handle, "| $mg_passes_exe -K Section -K Paragraph -f $basefilename -d $builddir -T2")) {
+        !open ($handle, "| $mg_passes_exe -K Section  -f $basefilename -d $builddir -T2")) {
         die "mgppbuilder::compress_text - couldn't run $mg_passes_exe\n";
         }
@@ -637 +637 @@
     } else {
     if (!-e "$mg_passes_exe" || 
-        !open (PIPEOUT, "| $mg_passes_exe -K Section -K Paragraph -d $builddir -f $basefilename -I1")) {
+        !open (PIPEOUT, "| $mg_passes_exe -K Section  -d $builddir -f $basefilename -I1")) {
         die "mgppbuilder::build_index - couldn't run $mg_passes_exe\n";
     }
@@ -664 +664 @@
 
     if (!-e "$mg_passes_exe" || 
-        !open ($handle, "| $mg_passes_exe -K Section -K Paragraph -d $builddir -f $basefilename -I2")) {
+        !open ($handle, "| $mg_passes_exe -K Section  -d $builddir -f $basefilename -I2")) {
         die "mgppbuilder::build_index - couldn't run $mg_passes_exe\n";
     }
@@ -851 +851 @@
     $build_cfg->{'notbuilt'} = $self->{'notbuilt'};
 
+
+    #store the indexed field information
+    foreach $field (sort keys %{$self->{'buildproc'}->{'indexfields'}}) {
+    
+    push (@{$build_cfg->{'indexfields'}}, $field);
+    }
     # write out the build information
     &cfgread::write_cfg_file("$self->{'build_dir'}/build.cfg", $build_cfg,
                  '^(builddate|buildtype|numdocs|numbytes)$', 
-                             '^(indexmap|subcollectionmap|languagemap|notbuilt)$');
+                             '^(indexmap|subcollectionmap|languagemap|notbuilt|indexfields)$');
 
 }

trunk/gsdl/perllib/mgppbuildproc.pm

@@ -69 +69 @@
 
     $self->{'indexing_text'} = 0;
+    $self->{'indexfields'} = {};
 
     return bless $self, $class;
@@ -439 +440 @@
 
     my $doc_section = 0; # just for this document
-    my $text = "<Document>\n";
+    my $text = "";
+    if ($self->{'num_docs'} == 1) {
+    $text = "<Document>\n";
+    }
+    else {
+    $text = "</Document><Document>\n";
+    }
     my $text_extra = "";
 
@@ -459 +466 @@
             if ($real_field eq "text") {
             #print STDERR "in text bit";
-            $new_text = "<Paragraph>";
+            #$new_text = "<Paragraph>";
             $new_text .= $doc_obj->get_text ($section);
-            $self->find_paragraphs($new_text);
+            #$self->find_paragraphs($new_text);
             } else { # metadata field
             if ($real_field eq "metadata") { # insert all metadata 
@@ -474 +481 @@
                     $mfield !~ /^gsdl/ && defined $mvalue && $mvalue ne "") {
                    
-                    $new_text .= "<Paragraph><$mfield>$mvalue</$mfield>\n";
+                    $new_text .= "<$mfield>$mvalue</$mfield>\n";
                     #print STDERR "metadata=$mfield:$mvalue";
-                    
+                    if (!defined $self->{'indexfields'}->{$mfield}) {
+                        $self->{'indexfields'}->{$mfield} = 1;
+                    }                   
                 }
                 }
@@ -482 +491 @@
             }
             else { #individual metadata specified
+                if (!defined $self->{'indexfields'}->{$real_field}) {
+                $self->{'indexfields'}->{$real_field} = 1;
+                }               
                 foreach $item (@{$doc_obj->get_metadata ($section, $real_field)}) {
-                $new_text .= "<Paragraph><$real_field>$item</$real_field>\n";
+                $new_text .= "<$real_field>$item</$real_field>\n";
                 }
             }