Changeset 8716 for trunk/gsdl/perllib/plugins/BasPlug.pm

Timestamp:

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

Author:

kjdon

Message:

added some changes made by Emanuel Dejanu (Simple Words)

File:

• trunk/gsdl/perllib/plugins/BasPlug.pm (modified) (10 diffs)

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
 }