Changeset 16847

Timestamp:

2008-08-16T16:07:05+12:00 (16 years ago)

Author:

kjdon

Message:

moved setting of self->basedir from BasePlugin to MediaConverter as that is where its used. ImagePlugin and PagedImagePlugin now call ImageCOnverter::begin

Location:

gsdl/trunk/perllib/plugins

Files:

• BasePlugin.pm (modified) (2 diffs)
• ImagePlugin.pm (modified) (1 diff)
• MediaConverter.pm (modified) (1 diff)
• PagedImagePlugin.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/BasePlugin.pm

@@ -115 +115 @@
     'type' => "enum",
     'list' => $oidtype_list,
-    # parsearg left "" as default
+    # leave default empty so we can tell if its been set or not - if not set will use option from import.pl
     #'deft' => "hash",
     'reqd' => "no",
@@ -282 +282 @@
     my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
 
-    # Save base_dir for use in file cache
-    # Would be more logical to do this in MediaConverter, but
-    # it's begin method doesn't appear to be called (29/6/08)
-    $self->{'base_dir'} = $base_dir;
 }
 

gsdl/trunk/perllib/plugins/ImagePlugin.pm

@@ -74 +74 @@
 }
 
+sub begin {
+    my $self = shift (@_);
+    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
+
+    $self->SUPER::init(@_);
+    $self->ImageConverter::begin();
+}
+
 sub get_default_process_exp {
     my $self = shift (@_);

gsdl/trunk/perllib/plugins/MediaConverter.pm

@@ -60 +60 @@
 }
 
+sub begin {
+    my $self = shift (@_);
+    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
+
+    # Save base_dir for use in file cache
+    $self->{'base_dir'} = $base_dir;
+
+}
 
 

gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

@@ -220 +220 @@
     $self->SUPER::init(@_);
     $self->ImageConverter::init();
+}
+
+sub begin {
+    my $self = shift (@_);
+    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
+
+    $self->SUPER::init(@_);
+    $self->ImageConverter::begin();
 }