Changeset 17797

Timestamp:

2008-11-10T10:32:09+13:00 (15 years ago)

Author:

kjdon

Message:

my previous changes to the text method meant that field tags were being output for text as well as for index. Don't want this - they end up in the HTML and give errors. So now tags are only output if ->'indexing_text'}

Location:

gsdl/trunk/perllib

Files:

• lucenebuildproc.pm (modified) (2 diffs)
• mgppbuildproc.pm (modified) (2 diffs)

gsdl/trunk/perllib/lucenebuildproc.pm

@@ -227 +227 @@
         }
 
-        $new_text = "<$shortname index=\"1\">$new_text</$shortname>";
+        if ($self->{'indexing_text'}) {
+            # add the tag
+            $new_text = "<$shortname index=\"1\">$new_text</$shortname>";
+        }
         # filter the text
         $new_text = $self->filter_text ($field, $new_text);
@@ -234 +237 @@
         $text .= "$new_text";
 
-        if ($new_field) {
+        if ($self->{'indexing_text'} && $new_field) {
             # we need to add to the list in indexfields
             

gsdl/trunk/perllib/mgppbuildproc.pm

@@ -340 +340 @@
         # now we add the text and/or the metadata into new_text
         if ($section_text ne "" || scalar(@metadata_list)) {
-            $new_text .= "$paratag<$shortname>";
-            
+            if ($self->{'indexing_text'}) {
+            # only add tags in if indexing
+            $new_text .= "$paratag<$shortname>";
+            }
             if ($section_text ne "") {
             $new_text .= "$section_text ";
-            if ($paratag ne "" && scalar(@metadata_list)) {
+            if ($self->{'indexing_text'} && $paratag ne "" && scalar(@metadata_list)) {
                 $new_text .= "</$shortname>$paratag<$shortname>";
             }
@@ -351 +353 @@
             $new_text .= "$item ";
             }
-            $new_text .= "</$shortname>";
-            
-            if ($new_field) {
+            if ($self->{'indexing_text'}) {
+            # only add tags in if indexing
+            $new_text .= "</$shortname>";
+            }
+            if ($self->{'indexing_text'} && $new_field) {
             # we need to add to the list in indexfields