Changeset 12356

Timestamp:

2006-07-31T16:29:33+12:00 (18 years ago)

Author:

kjdon

Message:

modified Michael's indexed_section change so that gsdldoctype of indexed_doc will be indexed too

Location:

trunk/gsdl/perllib

Files:

• lucenebuildproc.pm (modified) (1 diff)
• mgbuildproc.pm (modified) (1 diff)
• mgppbuildproc.pm (modified) (3 diffs)

trunk/gsdl/perllib/lucenebuildproc.pm

@@ -147 +147 @@
     # sections match up with gdbm db
     my $indexed_section = $doc_obj->get_metadata_element($section, "gsdldoctype") || "indexed_section";
-    if (!$indexed_doc || $indexed_section ne "indexed_section") {
+    if (!$indexed_doc || ($indexed_section ne "indexed_section" && $indexed_section ne "indexed_doc")) {
         $text .= "\n</$sectiontag>\n" if ($sectiontag ne "");
         $section = $doc_obj->get_next_section($section);

trunk/gsdl/perllib/mgbuildproc.pm

@@ -86 +86 @@
 
     my $indexed_section = $doc_obj->get_metadata_element($section, "gsdldoctype") || "indexed_section";
-    if ($indexed_doc && $indexed_section eq "indexed_section") {
+    if (($indexed_doc) && ($indexed_section eq "indexed_section" || $indexed_section eq "indexed_doc")) {
         $self->{'num_bytes'} += $doc_obj->get_text_length ($section);
         foreach my $field (split (/,/, $fields)) {

trunk/gsdl/perllib/mgppbuildproc.pm

@@ -195 +195 @@
     # only output this document if it is one to be indexed
     return if ($doc_obj->get_doc_type() ne "indexed_doc");
-
+    
     my $indexed_doc = $self->is_subcollection_doc($doc_obj);
     
@@ -239 +239 @@
     $self->{'num_sections'} += 1;
     $text .= "$sectiontag";
-
+    
     my $indexed_section = $doc_obj->get_metadata_element($section, "gsdldoctype") || "indexed_section";
-    if (!$indexed_doc || $indexed_section ne "indexed_section") {
+    if ((!$indexed_doc) || ($indexed_section ne "indexed_section" && $indexed_section ne "indexed_doc")) {
         # we are not actually indexing anything for this document,
         # but we want to keep the section numbers the same, so we just
@@ -250 +250 @@
     
     $self->{'num_bytes'} += $doc_obj->get_text_length ($section);
-
     foreach my $field (split (/;/, $fields)) {
         # only deal with this field if it doesn't start with top or