Changeset 16847

Show
Ignore:
Timestamp:
16.08.2008 16:07:05 (11 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:
4 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/plugins/BasePlugin.pm

    r16821 r16847  
    115115    'type' => "enum", 
    116116    'list' => $oidtype_list, 
    117     # parsearg left "" as default 
     117    # leave default empty so we can tell if its been set or not - if not set will use option from import.pl 
    118118    #'deft' => "hash", 
    119119    'reqd' => "no", 
     
    282282    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_; 
    283283 
    284     # Save base_dir for use in file cache 
    285     # Would be more logical to do this in MediaConverter, but 
    286     # it's begin method doesn't appear to be called (29/6/08) 
    287     $self->{'base_dir'} = $base_dir; 
    288284} 
    289285 
  • gsdl/trunk/perllib/plugins/ImagePlugin.pm

    r16820 r16847  
    7474} 
    7575 
     76sub begin { 
     77    my $self = shift (@_); 
     78    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_; 
     79 
     80    $self->SUPER::init(@_); 
     81    $self->ImageConverter::begin(); 
     82} 
     83 
    7684sub get_default_process_exp { 
    7785    my $self = shift (@_); 
  • gsdl/trunk/perllib/plugins/MediaConverter.pm

    r16826 r16847  
    6060} 
    6161 
     62sub begin { 
     63    my $self = shift (@_); 
     64    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_; 
     65 
     66    # Save base_dir for use in file cache 
     67    $self->{'base_dir'} = $base_dir; 
     68 
     69} 
    6270 
    6371 
  • gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

    r16827 r16847  
    220220    $self->SUPER::init(@_); 
    221221    $self->ImageConverter::init(); 
     222} 
     223 
     224sub begin { 
     225    my $self = shift (@_); 
     226    my ($pluginfo, $base_dir, $processor, $maxdocs) = @_; 
     227 
     228    $self->SUPER::init(@_); 
     229    $self->ImageConverter::begin(); 
    222230} 
    223231