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

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -491 +491 @@
 {
     my $self = shift (@_);  
-    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
-    
-    # check the process_exp and block_exp thing
-    my ($block_status,$filename) = $self->read_block(@_);    
-    return $block_status if ((!defined $block_status) || ($block_status==0));
-    
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
+        
     # get the input file
     my $input_filename = $file;
@@ -523 +519 @@
     
     # call the parent read_into_doc_obj
-    my ($process_status,$doc_obj) = $self->SUPER::read_into_doc_obj($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli);
+    my ($process_status,$doc_obj) = $self->SUPER::read_into_doc_obj($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli);
     
     return ($process_status,$doc_obj);
@@ -554 +550 @@
     my $self = shift (@_);
     
-    return q^(?i)\.(gif|jpe?g|jpe|jpg|png|css)$^;
+    #return q^(?i)\.(gif|jpe?g|jpe|jpg|png|css)$^;
+    return "";
 }
 
@@ -567 +564 @@
 {
     my $self =shift (@_);
-    my ($filename) = @_;
-    my $html_fname = $filename;
+    my ($filename_full_path, $block_hash) = @_;
+
+    my $html_fname = $filename_full_path;
     my @file_blocks;
     
-    my ($language, $encoding) = $self->textcat_get_language_encoding ($filename);
+    my ($language, $encoding) = $self->textcat_get_language_encoding ($filename_full_path);
 
     # read in file ($text will be in utf8)
     my $text = "";
-    $self->read_file ($filename, $encoding, $language, \$text);
+    $self->read_file ($filename_full_path, $encoding, $language, \$text);
     my $textref = \$text;
     my $opencom = '(?:<!--|&lt;!(?:&mdash;|&#151;|--))';
@@ -600 +598 @@
     if ($link !~ m@^/@ && $link !~ m/^([A-Z]:?)\\/) {
         # Turn relative file path into full path
-        my $dirname = &File::Basename::dirname($filename);
+        my $dirname = &File::Basename::dirname($filename_full_path);
         $link = &util::filename_cat($dirname, $link);
     }
     $link = $self->eval_dir_dots($link);
     
-    $self->{'file_blocks'}->{$link} = 1;
+    $block_hash->{'file_blocks'}->{$link} = 1;
     }
 }