Changeset 27352

Show
Ignore:
Timestamp:
16.05.2013 15:10:00 (6 years ago)
Author:
kjdon
Message:

added filename into the list for OIDtype

Location:
main/trunk/greenstone2/perllib
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/docproc.pm

    r26536 r27352  
    5454    my ($type, $metadata) = @_; 
    5555 
    56     if ($type =~ /^(hash|hash_on_full_filename|incremental|dirname|full_filename|assigned)$/) { 
     56    if ($type =~ /^(hash|hash_on_full_filename|incremental|filename|dirname|full_filename|assigned)$/) { 
    5757    $self->{'OIDtype'} = $type; 
    5858    } else { 
  • main/trunk/greenstone2/perllib/inexport.pm

    r27334 r27352  
    304304 
    305305    if (!defined $self->{'OIDtype'}  
    306     || ($self->{'OIDtype'} !~ /^(hash|hash_on_full_filename|incremental|assigned|dirname|full_filename)$/ )) { 
     306    || ($self->{'OIDtype'} !~ /^(hash|hash_on_full_filename|incremental|assigned|filename|dirname|full_filename)$/ )) { 
    307307    # OIDtype was either not defined on the command-line, or if it was not one of the recognized values 
    308308    if (defined $collectcfg->{'OIDtype'}  
    309         && $collectcfg->{'OIDtype'} =~ /^(hash|hash_on_full_filename|incremental|assigned|dirname|full_filename)$/) { 
     309        && $collectcfg->{'OIDtype'} =~ /^(hash|hash_on_full_filename|incremental|assigned|filename|dirname|full_filename)$/) { 
    310310        $self->{'OIDtype'} = $collectcfg->{'OIDtype'}; 
    311311    } else { 
  • main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

    r27306 r27352  
    288288} 
    289289 
    290 # OIDtype may be "hash" or "incremental" or "dirname" or "assigned" 
     290# OIDtype may be "hash" or "hash_on_full_filename" or "incremental" or "filename" or "dirname" or "full_filename" or "assigned" 
    291291sub set_OIDtype { 
    292292    my $self = shift (@_); 
    293293    my ($type, $metadata) = @_; 
    294294 
    295     if ($type =~ /^(hash|hash_on_full_filename|incremental|dirname|full_filename|assigned)$/) { 
     295    if ($type =~ /^(hash|hash_on_full_filename|incremental|filename|dirname|full_filename|assigned)$/) { 
    296296    $self->{'OIDtype'} = $type; 
    297297    } else {