Changeset 17203


Ignore:
Timestamp:
2008-09-08T11:21:35+12:00 (16 years ago)
Author:
kjdon
Message:

BasPlugout renamed to BasePlugout. And tidied up the constructors

Location:
gsdl/trunk/perllib/plugouts
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/perllib/plugouts/DSpacePlugout.pm

    r13172 r17203  
    3131eval {require bytes};
    3232use util;
    33 use BasPlugout;
     33use BasePlugout;
    3434
    3535sub BEGIN {
    36     @DSpacePlugout::ISA = ('BasPlugout');
     36    @DSpacePlugout::ISA = ('BasePlugout');
    3737}
    3838
    … …  
    4949    push(@$plugoutlist, $class);
    5050
    51     if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
    52     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
    53 
    54     my $self = (defined $hashArgOptLists)? new BasPlugout($plugoutlist,$inputargs,$hashArgOptLists): new BasPlugout($plugoutlist,$inputargs);
    55    
    56      
    57    return bless $self, $class;
     51    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
     52    push(@{$hashArgOptLists->{"OptList"}},$options);
     53
     54    my $self = new BasePlugout($plugoutlist,$inputargs,$hashArgOptLists);   
     55   
     56    return bless $self, $class;
    5857}
    5958

  • gsdl/trunk/perllib/plugouts/FedoraMETSPlugout.pm

    r17063 r17203  
    6464   
    6565   
    66     if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
    67     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
    68    
    69     my $self = (defined $hashArgOptLists)? new METSPlugout($plugoutlist,$inputargs,$hashArgOptLists): new METSPlugout($plugoutlist,$inputargs);
    70    
     66    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
     67    push(@{$hashArgOptLists->{"OptList"}},$options);
     68   
     69    my $self = new METSPlugout($plugoutlist,$inputargs,$hashArgOptLists);
    7170   
    7271    return bless $self, $class;

  • gsdl/trunk/perllib/plugouts/GAPlugout.pm

    r13172 r17203  
    3232eval {require bytes};
    3333use util;
    34 use BasPlugout;
     34use BasePlugout;
    3535use docprint;
    3636
    3737sub BEGIN {
    38     @GAPlugout::ISA = ('BasPlugout');
     38    @GAPlugout::ISA = ('BasePlugout');
    3939}
    4040
    … …  
    5151    push(@$plugoutlist, $class);
    5252
    53     if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
    54     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
     53    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
     54    push(@{$hashArgOptLists->{"OptList"}},$options);
    5555
    56     my $self = (defined $hashArgOptLists)? new BasPlugout($plugoutlist,$inputargs,$hashArgOptLists): new BasPlugout($plugoutlist,$inputargs);
     56    my $self = new BasePlugout($plugoutlist,$inputargs,$hashArgOptLists);
    5757 
    58    return bless $self, $class;
     58    return bless $self, $class;
    5959}
    6060

  • gsdl/trunk/perllib/plugouts/GreenstoneMETSPlugout.pm

    r16996 r17203  
    5353    push(@$plugoutlist, $class);
    5454     
    55     if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
    56     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
    57 
    58     my $self = (defined $hashArgOptLists)? new METSPlugout($plugoutlist,$inputargs,$hashArgOptLists): new METSPlugout($plugoutlist,$inputargs);
    59 
    60    
    61    return bless $self, $class;
     55    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
     56    push(@{$hashArgOptLists->{"OptList"}},$options);
     57
     58    my $self = new METSPlugout($plugoutlist,$inputargs,$hashArgOptLists);
     59   
     60    return bless $self, $class;
    6261}
    6362

  • gsdl/trunk/perllib/plugouts/MARCXMLPlugout.pm

    r14971 r17203  
    3131eval {require bytes};
    3232use util;
    33 use BasPlugout;
     33use BasePlugout;
    3434use docprint; # for escape_text
    3535
    3636
    3737sub BEGIN {
    38     @MARCXMLPlugout::ISA = ('BasPlugout');
     38    @MARCXMLPlugout::ISA = ('BasePlugout');
    3939}
    4040
    … …  
    6666    push(@$plugoutlist, $class);
    6767
    68     if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
    69     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
     68    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
     69    push(@{$hashArgOptLists->{"OptList"}},$options);
    7070
    71     my $self = (defined $hashArgOptLists)? new BasPlugout($plugoutlist,$inputargs,$hashArgOptLists): new BasPlugout($plugoutlist,$inputargs);
     71    my $self = new BasePlugout($plugoutlist,$inputargs,$hashArgOptLists);
    7272
    73          
    74    $self->{'buffered_output'} ="";
     73    $self->{'buffered_output'} ="";
    7574
    7675    if (!defined $self->{'mapping_file'} ||  (defined $self->{'mapping_file'} && $self->{'mapping_file'} eq "")){

  • gsdl/trunk/perllib/plugouts/METSPlugout.pm

    r17055 r17203  
    3434eval {require bytes};
    3535use util;
    36 use BasPlugout;
     36use BasePlugout;
    3737use docprint; # for escape_text
    3838
    3939sub BEGIN {
    40     @METSPlugout::ISA = ('BasPlugout');
     40    @METSPlugout::ISA = ('BasePlugout');
    4141}
    4242
    … …  
    6767
    6868     
    69     if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
    70     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
    71 
    72     my $self = (defined $hashArgOptLists)? new BasPlugout($plugoutlist,$inputargs,$hashArgOptLists): new BasPlugout($plugoutlist,$inputargs);
    73 
    74    
    75    return bless $self, $class;
     69    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
     70    push(@{$hashArgOptLists->{"OptList"}},$options);
     71
     72    my $self = new BasePlugout($plugoutlist,$inputargs,$hashArgOptLists);
     73    return bless $self, $class;
    7674}
    7775
Note: See TracChangeset for help on using the changeset viewer.