Changeset 8716 for trunk/gsdl/perllib/plugins

Timestamp:

2004-12-01T16:14:11+13:00 (20 years ago)

Author:

kjdon

Message:

added some changes made by Emanuel Dejanu (Simple Words)

Location:

trunk/gsdl/perllib/plugins

Files:

• ArcPlug.pm (modified) (1 diff)
• BasPlug.pm (modified) (10 diffs)
• GAPlug.pm (modified) (2 diffs)
• HTMLPlug.pm (modified) (1 diff)
• OAIPlug.pm (modified) (1 diff)
• PDFPlug.pm (modified) (1 diff)
• RecPlug.pm (modified) (3 diffs)
• SplitPlug.pm (modified) (1 diff)
• UnknownPlug.pm (modified) (1 diff)
• XMLPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/ArcPlug.pm

@@ -39 +39 @@
 
 BEGIN {
-    @ISA = ('BasPlug');
+    @ArcPlug::ISA = ('BasPlug');
 }
 

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -143 +143 @@
 sub get_arguments
 {
-    local $self = shift(@_);
-    local $optionlistref = $self->{'option_list'};
-    local @optionlist = @$optionlistref;
-    local $pluginoptions = pop(@$optionlistref);
-    local $pluginarguments = $pluginoptions->{'args'};
+    my $self = shift(@_);
+    my $optionlistref = $self->{'option_list'};
+    my @optionlist = @$optionlistref;
+    my $pluginoptions = pop(@$optionlistref);
+    my $pluginarguments = $pluginoptions->{'args'};
     return $pluginarguments;
 }
@@ -154 +154 @@
 sub print_xml_usage
 {
-    local $self = shift(@_);
+    my $self = shift(@_);
 
     # XML output is always in UTF-8
@@ -166 +166 @@
 sub print_xml
 {
-    local $self = shift(@_);
-
-    local $optionlistref = $self->{'option_list'};
-    local @optionlist = @$optionlistref;
-    local $pluginoptions = pop(@$optionlistref);
+    my $self = shift(@_);
+
+    my $optionlistref = $self->{'option_list'};
+    my @optionlist = @$optionlistref;
+    my $pluginoptions = pop(@$optionlistref);
     return if (!defined($pluginoptions));
 
@@ -197 +197 @@
 sub print_txt_usage
 {
-    local $self = shift(@_);
+    my $self = shift(@_);
 
     # Print the usage message for a plugin (recursively)
-    local $descoffset = $self->determine_description_offset(0);
+    my $descoffset = $self->determine_description_offset(0);
     $self->print_plugin_usage($descoffset, 1);
 }
@@ -207 +207 @@
 sub determine_description_offset
 {
-    local $self = shift(@_);
-    local $maxoffset = shift(@_);
-
-    local $optionlistref = $self->{'option_list'};
-    local @optionlist = @$optionlistref;
-    local $pluginoptions = pop(@$optionlistref);
+    my $self = shift(@_);
+    my $maxoffset = shift(@_);
+
+    my $optionlistref = $self->{'option_list'};
+    my @optionlist = @$optionlistref;
+    my $pluginoptions = pop(@$optionlistref);
     return $maxoffset if (!defined($pluginoptions));
 
     # Find the length of the longest option string of this plugin
-    local $pluginargs = $pluginoptions->{'args'};
+    my $pluginargs = $pluginoptions->{'args'};
     if (defined($pluginargs)) {
-    local $longest = &PrintUsage::find_longest_option_string($pluginargs);
+    my $longest = &PrintUsage::find_longest_option_string($pluginargs);
     if ($longest > $maxoffset) {
         $maxoffset = $longest;
@@ -233 +233 @@
 sub print_plugin_usage
 {
-    local $self = shift(@_);
-    local $descoffset = shift(@_);
-    local $isleafclass = shift(@_);
-
-    local $optionlistref = $self->{'option_list'};
-    local @optionlist = @$optionlistref;
-    local $pluginoptions = pop(@$optionlistref);
+    my $self = shift(@_);
+    my $descoffset = shift(@_);
+    my $isleafclass = shift(@_);
+
+    my $optionlistref = $self->{'option_list'};
+    my @optionlist = @$optionlistref;
+    my $pluginoptions = pop(@$optionlistref);
     return if (!defined($pluginoptions));
 
-    local $pluginname = $pluginoptions->{'name'};
-    local $pluginargs = $pluginoptions->{'args'};
-    local $plugindesc = $pluginoptions->{'desc'};
+    my $pluginname = $pluginoptions->{'name'};
+    my $pluginargs = $pluginoptions->{'args'};
+    my $plugindesc = $pluginoptions->{'desc'};
 
     # Produce the usage information using the data structure above
@@ -257 +257 @@
     if (defined($pluginargs)) {
     # Calculate the column offset of the option descriptions
-    local $optiondescoffset = $descoffset + 2;  # 2 spaces between options & descriptions
+    my $optiondescoffset = $descoffset + 2;  # 2 spaces between options & descriptions
 
     if ($isleafclass) {
@@ -486 +486 @@
 
     $self->extra_metadata ($doc_obj, $doc_obj->get_top_section(), $metadata);
-
+    
     # do plugin specific processing of doc_obj
-    return -1  unless defined ($self->process (\$text, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli));
-   
+    unless (defined ($self->process (\$text, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli))) {
+    $text = '';
+    undef $text;
+    return -1;
+    }
+    $text='';
+    undef $text;
+
     # do any automatic metadata extraction
     $self->auto_extract_metadata ($doc_obj);
@@ -495 +501 @@
     # add an OID
     # see if there is a plugin-specific set_OID function...
-    if (defined ($self->can(set_OID))) {
+    if (defined ($self->can('set_OID'))) {
     # it will need $doc_obj to set the Identifier metadata...
     $self->set_OID($doc_obj);
@@ -507 +513 @@
 
     $self->{'num_processed'} ++;
-
+    undef $doc_obj;
     return 1; # processed the file
 }

trunk/gsdl/perllib/plugins/GAPlug.pm

@@ -29 +29 @@
 # to their DTD.
 
-# 12/05/02 Added usage datastructure - John Thompson
-
 package GAPlug;
 
@@ -36 +34 @@
 
 sub BEGIN {
-    @ISA = ('XMLPlug');
+    @GAPlug::ISA = ('XMLPlug');
 }
 

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -45 +45 @@
 
 sub BEGIN {
-    @ISA = ('BasPlug');
+    @HTMLPlug::ISA = ('BasPlug');
 }
 

trunk/gsdl/perllib/plugins/OAIPlug.pm

@@ -33 +33 @@
 
 sub BEGIN {
-    @ISA = ('BasPlug');
+    @OAIPlug::ISA = ('BasPlug');
 }
 

trunk/gsdl/perllib/plugins/PDFPlug.pm

@@ -31 +31 @@
 use unicode;
 
+sub BEGIN {
 @PDFPlug::ISA = ('ConvertToPlug');
+}
 
 my $arguments =

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -100 +100 @@
 
 BEGIN {
-    @ISA = ('BasPlug');
+    @RecPlug::ISA = ('BasPlug');
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
 }
@@ -238 +238 @@
 
     # Re-order the files in the list so any directories ending with .all are moved to the end
-    for ($i = scalar(@dir) - 1; $i >= 0; $i--) {
+    for (my $i = scalar(@dir) - 1; $i >= 0; $i--) {
     if (-d &util::filename_cat($dirname, $dir[$i]) && $dir[$i] =~ /\.all$/) {
         push(@dir, splice(@dir, $i, 1));
@@ -302 +302 @@
 
         # Any new files are added to the end of @dir to get processed by the loop
+        my $j;
         foreach my $subfilenow (@dirnow) {
         for ($j = 0; $j < $num_files; $j++) {

trunk/gsdl/perllib/plugins/SplitPlug.pm

@@ -41 +41 @@
 
 use BasPlug;
-# SplitPlug is a sub-class of BasPlug.
-@SplitPlug::ISA = ('BasPlug');
 use gsprintf 'gsprintf';
 use util;
 
+# SplitPlug is a sub-class of BasPlug.
+sub BEGIN {
+@SplitPlug::ISA = ('BasPlug');
+}
 
 

trunk/gsdl/perllib/plugins/UnknownPlug.pm

@@ -61 +61 @@
 
 sub BEGIN {
-    @ISA = ('BasPlug');
+    @UnknownPlug::ISA = ('BasPlug');
 }
 

trunk/gsdl/perllib/plugins/XMLPlug.pm

@@ -30 +30 @@
 
 sub BEGIN {
-    @ISA = ('BasPlug');
+    @XMLPlug::ISA = ('BasPlug');
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
 }
@@ -232 +232 @@
 sub close_document {
     my $self = shift(@_);
-
+    my $doc_obj = $self->{'doc_obj'};
     # include any metadata passed in from previous plugins 
     # note that this metadata is associated with the top level section
-    $self->extra_metadata ($self->{'doc_obj'}, 
-               $self->{'doc_obj'}->get_top_section(), 
+    $self->extra_metadata ($doc_obj, 
+               $doc_obj->get_top_section(), 
                $self->{'metadata'});
    
     # do any automatic metadata extraction
-    $self->auto_extract_metadata ($self->{'doc_obj'});
+    $self->auto_extract_metadata ($doc_obj);
    
     # add an OID
-    $self->{'doc_obj'}->set_OID();
+    $doc_obj->set_OID();
     
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Plugin", "$self->{'plugin_type'}");
@@ -249 +249 @@
 
     # process the document
-    $self->{'processor'}->process($self->{'doc_obj'});
+    $self->{'processor'}->process($doc_obj);
     
     $self->{'num_processed'} ++;