Changeset 26221 for main/trunk

Timestamp:

2012-09-20T09:34:45+12:00 (12 years ago)

Author:

kjdon

Message:

new OIDtype, filename, will use the file name without any folders or file extension. Must be unique filenames in the collection. BasePlugin add_OID method returns if an id has already been set

Location:

main/trunk/greenstone2/perllib

Files:

• doc.pm (modified) (2 diffs)
• plugins/BasePlugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/doc.pm

@@ -204 +204 @@
     my ($type, $metadata) = @_;
 
-    if (defined $type && $type =~ /^(hash|hash_on_file|hash_on_ga_xml|incremental|dirname|assigned)$/) {
+    if (defined $type && $type =~ /^(hash|hash_on_file|hash_on_ga_xml|incremental|filename|dirname|assigned)$/) {
     $self->{'OIDtype'} = $type;
     } else {
@@ -401 +401 @@
         $OID = "D" . $OIDcount;
         $OIDcount ++;
-      
+    } elsif ($self->{'OIDtype'} eq "filename") {
+        my $filename = $self->get_source_filename();
+        $OID = &File::Basename::fileparse($filename, qr/\.[^.]*/);
+        $OID = &util::tidy_up_oid($OID);
     } elsif ($self->{'OIDtype'} eq "dirname") {
         $OID = 'J';

main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

@@ -101 +101 @@
       { 'name' => "incremental",
         'desc' => "{import.OIDtype.incremental}" },
+      { 'name' => "filename",
+        'desc' => "{import.OIDtype.filename}" },
       { 'name' => "dirname",
         'desc' => "{import.OIDtype.dirname}" } ];
@@ -1016 +1018 @@
     my ($doc_obj) = @_;
 
+    # don't add one if there is one already set
+    return unless $doc_obj->get_OID() =~ /^NULL$/;
     $doc_obj->set_OIDtype($self->{'OIDtype'}, $self->{'OIDmetadata'});