Changeset 10254 for trunk/gsdl/perllib/plugins/PagedImgPlug.pm

Timestamp:

2005-07-19T16:27:51+12:00 (19 years ago)

Author:

kjdon

Message:

added 'use strict' to all plugins, and made modifications (mostly adding 'my') to make them compile

File:

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

trunk/gsdl/perllib/plugins/PagedImgPlug.pm

@@ -135 +135 @@
 
 use XMLPlug;
+use strict;
+no strict 'refs'; # allow filehandles to be variables and viceversa
 
 sub BEGIN {
@@ -282 +284 @@
     my $filehead = &util::get_tmp_filename();
     $filename = $filehead . ".$converttotype";
-    $n = 1;
+    my $n = 1;
     while (-e $filename) {
         $filename = "$filehead$n\.$converttotype";
@@ -527 +529 @@
 
 sub read {
-    $self = shift (@_);
+    my $self = shift (@_);
     my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
     my $outhandle   = $self->{'outhandle'};
@@ -643 +645 @@
     $self->extra_metadata ($doc_obj, $section, $metadata);
 
-    # do plugin specific processing of doc_obj
-    unless (defined ($self->process(\$text, $pluginfo, $base_dir, $file, $metadata, $doc_obj))) {
-    print STDERR "<ProcessingError n='$file'>\n" if ($gli);
-    return -1;
-    }
+    # do plugin specific processing of doc_obj - don't need this unless
+    # something inherits from PagedImgPlug
+    #unless (defined ($self->process(\$text, $pluginfo, $base_dir, $file, $metadata, $doc_obj))) {
+#   print STDERR "<ProcessingError n='$file'>\n" if ($gli);
+#   return -1;
+#    }
 
     # do any automatic metadata extraction
@@ -806 +809 @@
     if ($line =~ /^<([^>]*)>(.*?)\s*$/) {
         $doc_obj->set_utf8_metadata_element ($topsection, $1, $2);
-        $meta->{$1} = $2;
+        #$meta->{$1} = $2;
     } else {
         $num++;