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

gsdl/trunk/perllib/plugins/GMLPlugin.pm

@@ -79 +79 @@
 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) = @_;
     my $outhandle = $self->{'outhandle'};
 
-    #check process and block exps, smart block, etc
-    my ($block_status,$filename) = $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);
 
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
@@ -95 +95 @@
     $parent_dir = &util::filename_cat ($base_dir, $parent_dir);
 
-    if (!open (INFILE, $filename)) {
+    if (!open (INFILE, $filename_full_path)) {
     if ($gli) {
-        print STDERR "<ProcessingError n='$file' r='Could not read $filename'>\n";
+        print STDERR "<ProcessingError n='$file' r='Could not read $filename_full_path'>\n";
     }
-    print $outhandle "GMLPlugin::read - couldn't read $filename\n";
+    print $outhandle "GMLPlugin::read - couldn't read $filename_full_path\n";
     return -1;
     }
@@ -133 +133 @@
 
         } else {
-            print $outhandle "GMLPlugin::read - error in file $filename\n";
+            print $outhandle "GMLPlugin::read - error in file $filename_full_path\n";
             print $outhandle "text: \"$gml\"\n";
             last;