Changeset 27352

Timestamp:

2013-05-16T15:10:00+12:00 (11 years ago)

Author:

kjdon

Message:

added filename into the list for OIDtype

Location:

main/trunk/greenstone2/perllib

Files:

• docproc.pm (modified) (1 diff)
• inexport.pm (modified) (1 diff)
• plugouts/BasePlugout.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/docproc.pm

@@ -54 +54 @@
     my ($type, $metadata) = @_;
 
-    if ($type =~ /^(hash|hash_on_full_filename|incremental|dirname|full_filename|assigned)$/) {
+    if ($type =~ /^(hash|hash_on_full_filename|incremental|filename|dirname|full_filename|assigned)$/) {
     $self->{'OIDtype'} = $type;
     } else {

main/trunk/greenstone2/perllib/inexport.pm

@@ -304 +304 @@
 
     if (!defined $self->{'OIDtype'} 
-    || ($self->{'OIDtype'} !~ /^(hash|hash_on_full_filename|incremental|assigned|dirname|full_filename)$/ )) {
+    || ($self->{'OIDtype'} !~ /^(hash|hash_on_full_filename|incremental|assigned|filename|dirname|full_filename)$/ )) {
     # OIDtype was either not defined on the command-line, or if it was not one of the recognized values
     if (defined $collectcfg->{'OIDtype'} 
-        && $collectcfg->{'OIDtype'} =~ /^(hash|hash_on_full_filename|incremental|assigned|dirname|full_filename)$/) {
+        && $collectcfg->{'OIDtype'} =~ /^(hash|hash_on_full_filename|incremental|assigned|filename|dirname|full_filename)$/) {
         $self->{'OIDtype'} = $collectcfg->{'OIDtype'};
     } else {

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -288 +288 @@
 }
 
-# OIDtype may be "hash" or "incremental" or "dirname" or "assigned"
+# OIDtype may be "hash" or "hash_on_full_filename" or "incremental" or "filename" or "dirname" or "full_filename" or "assigned"
 sub set_OIDtype {
     my $self = shift (@_);
     my ($type, $metadata) = @_;
 
-    if ($type =~ /^(hash|hash_on_full_filename|incremental|dirname|full_filename|assigned)$/) {
+    if ($type =~ /^(hash|hash_on_full_filename|incremental|filename|dirname|full_filename|assigned)$/) {
     $self->{'OIDtype'} = $type;
     } else {