Changeset 26893 for main

Timestamp:

2013-02-19T14:12:28+13:00 (11 years ago)

Author:

kjdon

Message:

ConvertBinaryFile needs to reset the doc OID after all the processing has been done. This will mean it uses the top level plugin OIDtype settings, rather than the secondary plugin ones.

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• BasePlugin.pm (modified) (1 diff)
• ConvertBinaryFile.pm (modified) (3 diffs)

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

@@ -1020 +1020 @@
 sub add_OID {
     my $self = shift (@_);  
-    my ($doc_obj) = @_;
-
-    # don't add one if there is one already set
-    return unless $doc_obj->get_OID() =~ /^NULL$/;
+    my ($doc_obj, $force) = @_;
+
+    # don't add one if there is one already set, unless we are forced to do so
+    return unless ($doc_obj->get_OID() =~ /^NULL$/ || $force);
     $doc_obj->set_OIDtype($self->{'OIDtype'}, $self->{'OIDmetadata'});
 

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

@@ -175 +175 @@
     $self->{'convert_to_ext'} = $convert_to_ext;
     }
-
 }
 sub init {
@@ -405 +404 @@
     $doc_obj->set_converted_filename($collect_conv_file);
 
-    my $plugin_filename_encoding = $self->{'filename_encoding'};
+    my $plugin_filename_encoding = $self->{'filename_encoding'};
     my $filename_encoding = $self->deduce_filename_encoding($file,$metadata,$plugin_filename_encoding);
     $self->set_Source_metadata($doc_obj, $filename_full_path, $filename_encoding);
@@ -434 +433 @@
     $self->title_fallback($doc_obj,$topsection,$filename_no_path);
 
-    $self->add_OID($doc_obj);
+    # force a new OID - this will use OIDtype option set for this plugin.
+    $self->add_OID($doc_obj, 1);
 
     return (1, $doc_obj);