Changeset 25742 for main

Timestamp:

2012-06-05T12:39:41+12:00 (12 years ago)

Author:

kjdon

Message:

change to use can_process_this_file instead of metadata_read to test whether we can process this file or not. Also added a few segment ouptput messages for gli

File:

• main/trunk/greenstone2/perllib/plugins/SplitTextFile.pm (modified) (3 diffs)

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

@@ -121 +121 @@
     $extrametakeys, $extrametadata, $extrametafile,
     $processor, $gli, $aux) = @_;
-
-    # returns 1 if matches process_exp
-    my $matched = $self->SUPER::metadata_read($pluginfo, $base_dir, $file,
-                          $block_hash, 
-                          $extrametakeys, 
-                          $extrametadata, 
-                          $extrametafile,
-                          $processor, $gli, $aux);
-    my $split_matched = undef;
-
-    if ($matched) {
-
-    my $outhandle = $self->{'outhandle'};
-    my $filename = &util::filename_cat($base_dir, $file);
+    
+    # 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);
+
+        my $outhandle = $self->{'outhandle'};
+        my $filename = &util::filename_cat($base_dir, $file);
 
     my $plugin_name = ref ($self);
@@ -181 +174 @@
     
     $self->{'split_segments'}->{$file} = \@segments;
-    $split_matched = scalar(@segments);
-    }
-    
-    return $split_matched;
+    
+    return  scalar(@segments);
 }
 
@@ -263 +254 @@
     # do plugin specific processing of doc_obj
     print $outhandle "segment $segment\n" if ($self->{'verbosity'});
+    print STDERR "<Processing s='$segment' n='$file' p='$self->{'plugin_type'}'>\n" if ($gli);
     $status = $self->process (\$segtext, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli);
     if (!defined $status) {
-        print $outhandle "WARNING - no plugin could process segment $segment of $file\n" 
+        print $outhandle "WARNING: no plugin could process segment $segment of $file\n" 
         if ($verbosity >= 2);
+        print STDERR "<ProcessingError s='$segment' n='$file'>\n" if $gli;
         next;
     }