Changeset 16392 for gsdl/trunk/perllib/plugins/FOXPlugin.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/FOXPlugin.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/FOXPlugin.pm

@@ -93 +93 @@
 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) = @_;
  
-    #check for associate_ext, blocking etc, are we processing this file?
-    my ($block_status,$fullname) = $self->read_block(@_);    
-    return $block_status if ((!defined $block_status) || ($block_status==0));
+    # can we process this file??
+    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);
 
     print STDERR "<Processing n='$file' p='FOXPlugin'>\n" if ($gli);
     print STDERR "FOXPlugin: processing $file\n" if $self->{'verbosity'} > 1;
 
-    my ($parent_dir) = $fullname =~ /^(.*)\/[^\/]+\.dbf$/i;
+    my ($parent_dir) = $filename_full_path =~ /^(.*)\/[^\/]+\.dbf$/i;
 
     # open the file
-    if (!open (FOXBASEIN, $fullname)) {
+    if (!open (FOXBASEIN, $filename_full_path)) {
     if ($gli) {
-        print STDERR "<ProcessingError n='$file' r='Could not read $fullname'>\n";
-    }
-    print STDERR "FOXPlugin::read - couldn't read $fullname\n";
+        print STDERR "<ProcessingError n='$file' r='Could not read $filename_full_path'>\n";
+    }
+    print STDERR "FOXPlugin::read - couldn't read $filename_full_path\n";
     return -1; # error in processing
     }
@@ -141 +141 @@
         print STDERR "<ProcessingError n='$file' r='Does not seem to be a Foxbase file'>\n";
     }
-    print STDERR "FOXPlugin:read - $fullname doesn't seem to be a Foxbase file\n";
+    print STDERR "FOXPlugin:read - $filename_full_path doesn't seem to be a Foxbase file\n";
     return -1;
     }
@@ -163 +163 @@
 
     # open the dbt file if we need to
-    my $dbtfullname = $fullname;
-    if ($fullname =~ /f$/) {
+    my $dbtfullname = $filename_full_path;
+    if ($filename_full_path =~ /f$/) {
     $dbtfullname =~ s/f$/t/;
     } else {