Changeset 17117

Timestamp:

2008-09-01T11:54:30+12:00 (16 years ago)

Author:

kjdon

Message:

when indexing a combined field, put the field tags arounds the whole content, not each metadata value in the field. otherwise searching across fields doesn't work

File:

• gsdl/trunk/perllib/mgppbuildproc.pm (modified) (4 diffs)

gsdl/trunk/perllib/mgppbuildproc.pm

@@ -282 +282 @@
             $self->{'indexfieldmap'}->{$shortname} = 1;
         }
+        # we only want one tag around the index
+        $new_text .= "$paratag<$shortname>";
         my @metadata_list = ();
         foreach my $submeta (split /,/, $real_field) {
@@ -287 +289 @@
             my $section_text = $doc_obj->get_text($section);
             if ($self->{'indexing_text'}) {
-                # tag the text with <Text>...</Text>, add the <Paragraph> tags and strip out html if needed
-                $new_text .= "$paratag<$shortname>\n";
                 if ($paratag ne "") {
+                # we fiddle around with splitting text into paragraphs
+                $new_text .= "</$shortname>$paratag<$shortname>\n";
                 $section_text = $self->preprocess_text($section_text, $self->{'strip_html'}, "</$shortname>$paratag<$shortname>");
                 }
@@ -295 +297 @@
                 $section_text = $self->preprocess_text($section_text, $self->{'strip_html'}, "");
                 }
-                $new_text .= "$section_text</$shortname>\n";
+                $new_text .= "$section_text</$shortname><$shortname>\n";
             }
             else {
@@ -313 +315 @@
         }
         foreach my $item (@metadata_list) {
-            $new_text .= "$paratag<$shortname>$item</$shortname>\n";
-        }
+            #$new_text .= "$paratag<$shortname>$item</$shortname>\n";
+            $new_text .= "$item ";
+        }
+        $new_text .= "</$shortname>";
         }