Changeset 16504 for gsdl/trunk/perllib/lucenebuildproc.pm

Timestamp:

2008-07-22T12:08:59+12:00 (16 years ago)

Author:

mdewsnip

Message:

Changed some variable names in preparation for fixing the Lucene section indexing.

File:

• gsdl/trunk/perllib/lucenebuildproc.pm (modified) (5 diffs)

gsdl/trunk/perllib/lucenebuildproc.pm

@@ -81 +81 @@
     my ($fields) = split (/:/, $self->{'index'});
 
-    my $doc_level = $mgppbuildproc::level_map{'document'};
+    my $doc_tag_name = $mgppbuildproc::level_map{'document'};
 
     my $levels = $self->{'levels'};
@@ -102 +102 @@
     }
     my $gs2_docOID = $doc_obj->get_OID();
-    my $documenttag = "<$doc_level xmlns:gs2=\"http://www.greenstone.org/gs2\" file=\"$file\" gs2:id=\"$gs2_id\" gs2:docOID=\"$gs2_docOID\">\n";
-    my $documentendtag = "\n</$doc_level>\n";
-
-    my ($sectiontag) = "";
+    my $documenttag = "<$doc_tag_name xmlns:gs2=\"http://www.greenstone.org/gs2\" file=\"$file\" gs2:id=\"$gs2_id\" gs2:docOID=\"$gs2_docOID\">\n";
+    my $documentendtag = "\n</$doc_tag_name>\n";
+
+    my $sec_tag_name = "";
     if ($lsec_level)
       {
-    $sectiontag = $mgppbuildproc::level_map{'section'};
+    $sec_tag_name = $mgppbuildproc::level_map{'section'};
       }
     my ($parastarttag) = "";
@@ -137 +137 @@
     $self->{'num_sections'}++;
 
-    if ($sectiontag ne "")
+    if ($sec_tag_name ne "")
           {
         my $secid = "gs2:id=\"".$self->{'num_sections'}."\"";
-        $text .= "\n<$sectiontag $secid >\n";
+        $text .= "\n<$sec_tag_name $secid >\n";
           }
 
@@ -148 +148 @@
     my $indexed_section = $doc_obj->get_metadata_element($section, "gsdldoctype") || "indexed_section";
     if (($indexed_doc == 0) || ($indexed_section ne "indexed_section" && $indexed_section ne "indexed_doc")) {
-        $text .= "\n</$sectiontag>\n" if ($sectiontag ne "");
+        $text .= "\n</$sec_tag_name>\n" if ($sec_tag_name ne "");
             $section = $doc_obj->get_next_section($section);
         next;
@@ -275 +275 @@
     } # foreach field
 
-    $text .= "\n</$sectiontag>\n" if ($sectiontag ne "");
+    $text .= "\n</$sec_tag_name>\n" if ($sec_tag_name ne "");
 
         $section = $doc_obj->get_next_section($section);