Changeset 7090

Timestamp:

2004-03-17T16:15:22+13:00 (20 years ago)

Author:

sjboddie

Message:

Fixed some minor perl syntax problems that were causing warning messages
when building mgpp collections.

Location:

trunk/gsdl/perllib

Files:

• mgppbuilder.pm (modified) (5 diffs)
• mgppbuildproc.pm (modified) (1 diff)

trunk/gsdl/perllib/mgppbuilder.pm

@@ -320 +320 @@
     my $mgpp_passes_sections = "";
     my ($doc_level) = $self->{'doc_level'};
-    $mgpp_passes_sections .= "-J " . %level_map->{$doc_level} . " ";
+    $mgpp_passes_sections .= "-J " . $level_map{$doc_level} . " ";
     foreach $level (keys %{$self->{'levels'}}) {
     if ($level ne $doc_level && $level ne "paragraph") {
-        $mgpp_passes_sections .= "-K " . %level_map->{$level} . " ";
+        $mgpp_passes_sections .= "-K " . $level_map{$level} . " ";
     }
     }
@@ -611 +611 @@
     my $mgpp_passes_sections = "";
     my ($doc_level) = $self->{'doc_level'};
-    $mgpp_passes_sections .= "-J " . %level_map->{$doc_level} ." ";
+    $mgpp_passes_sections .= "-J " . $level_map{$doc_level} ." ";
     
     foreach $level (keys %{$self->{'levels'}}) {
     if ($level ne $doc_level) {
-        $mgpp_passes_sections .= "-K " . %level_map->{$level}. " ";
+        $mgpp_passes_sections .= "-K " . $level_map{$level}. " ";
     }
     }
@@ -890 +890 @@
     my $collmeta = ".$level"; # based on the original specification
     $level =~ tr/A-Z/a-z/; # make it lower case
-    my $levelid = %level_map->{$level}; # find the actual value we used in the index
+    my $levelid = $level_map{$level}; # find the actual value we used in the index
     if ($collmetadefined && defined $self->{'collect_cfg'}->{'collectionmeta'}->{$collmeta}) {
         $metadata_entry = $self->create_language_db_map($collmeta, $levelid);
@@ -896 +896 @@
     } else {
         # use the default macro
-        $level_entry .= "<$levelid>" . %level_map->{$levelid} . "\n";
+        $level_entry .= "<$levelid>" . $level_map{$levelid} . "\n";
     }
     }
@@ -1115 +1115 @@
     my @indexlevels = ();
     foreach $l (@{$self->{'levelorder'}}) {
-    push (@indexlevels, %level_map->{$l});
+    push (@indexlevels, $level_map{$l});
     }
     $build_cfg->{'indexlevels'} = \@indexlevels;
     
     if ($self->{'levels'}->{'section'}) {
-    $build_cfg->{'textlevel'} = %level_map->{'section'};
+    $build_cfg->{'textlevel'} = $level_map{'section'};
     } else {    
-    $build_cfg->{'textlevel'} = %level_map->{'document'};
+    $build_cfg->{'textlevel'} = $level_map{'document'};
     }
     # store the number of documents and number of bytes

trunk/gsdl/perllib/mgppbuildproc.pm

@@ -561 +561 @@
     my($documentendtag) = "";
     if ($self->{'levels'}->{'document'}) {
-    $documenttag = "\n<". %level_map->{'document'} . ">\n";
-    $documentendtag = "\n</". %level_map->{'document'} . ">\n";
+    $documenttag = "\n<". $level_map{'document'} . ">\n";
+    $documentendtag = "\n</". $level_map{'document'} . ">\n";
     }
     my ($sectiontag) = "";
     if ($self->{'levels'}->{'section'}) {
-    $sectiontag = "\n<". %level_map->{'section'} . ">\n";
+    $sectiontag = "\n<". $level_map{'section'} . ">\n";
     }
     my ($paratag) = "";
     if ($self->{'levels'}->{'paragraph'}) {
     if ($self->{'strip_html'}) {
-        $paratag = "<". %level_map->{'paragraph'} . ">";
+        $paratag = "<". $level_map{'paragraph'} . ">";
     } else {
         print $outhandle "Paragraph level can not be used with no_strip_html!. Not indexing Paragraphs.\n";