Changeset 16392 for gsdl/trunk/perllib/plugins/DBPlugin.pm

Timestamp:

2008-07-14T14:57:38+12:00 (16 years ago)

Author:

kjdon

Message:

global block pass: read_block is no more, use can_process_this_file to see whether a file is for us or not. extra arg (block_hash) to read, read_into_doc_obj, metadata_read etc

File:

• gsdl/trunk/perllib/plugins/DBPlugin.pm (modified) (6 diffs)

gsdl/trunk/perllib/plugins/DBPlugin.pm

@@ -80 +80 @@
 sub read {
     my $self = shift (@_);
-    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs,$total_count,$gli) = @_;
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs,$total_count,$gli) = @_;
         
      #see if we can handle the passed file...
-     my ($block_status,$filename) = $self->read_block(@_);    
-     return $block_status if ((!defined $block_status) || ($block_status==0));
-
+    my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
+    return undef unless $self->can_process_this_file($filename_full_path);
+    
     my $outhandle = $self->{'outhandle'};
     my $verbosity = $self->{'verbosity'};
@@ -120 +120 @@
 
     # read in config file.
-    if (!open (CONF, $filename)) {
-        print $outhandle "DBPlugin: can't read $filename: $!\n";
+    if (!open (CONF, $filename_full_path)) {
+        print $outhandle "DBPlugin: can't read $filename_full_path: $!\n";
         return 0;
     } 
@@ -172 +172 @@
             $err =~ s/\.$//; # remove a trailing .
             print $outhandle "DBPlugin: error evaluating `$statement'\n";
-            print $outhandle " $err (in $filename)\n";
+            print $outhandle " $err (in $filename_full_path)\n";
             return 0; # there was an error reading the config file
         }
@@ -189 +189 @@
     
     if (!defined($db)) {
-    print $outhandle "DBPlugin: error: $filename does not specify a db!\n";
+    print $outhandle "DBPlugin: error: $filename_full_path does not specify a db!\n";
     return 0;
     }
@@ -254 +254 @@
 
     # create a new document
-    my $doc_obj = new doc ($filename, "indexed_doc");
+    my $doc_obj = new doc ($filename_full_path, "indexed_doc");
     $doc_obj->set_OIDtype ($processor->{'OIDtype'}, $processor->{'OIDmetadata'});
     my $cursection = $doc_obj->get_top_section();
@@ -272 +272 @@
 
     if ($self->{'cover_image'}) {
-        $self->associate_cover_image($doc_obj, $filename);
+        $self->associate_cover_image($doc_obj, $filename_full_path);
     }
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Plugin", "$self->{'plugin_type'}");