Changeset 9067

Timestamp:

2005-02-16T16:26:34+13:00 (19 years ago)

Author:

kjdon

Message:

moved smart blocking stuff in htmlplug metadata_read into basplug metadata read. htmlplug now just needs to implement store_block_files. basplug smart block will block a cover image if -cover_images is on. Converttoplug store_block_files needs to call the basplug default one (do nothing) cos it doesn't want to use the html specific one. Image plug needs to implement store_cover_image to do nothing cos it doesn'tmake sense

Location:

trunk/gsdl/perllib/plugins

Files:

• BasPlug.pm (modified) (3 diffs)
• ConvertToPlug.pm (modified) (1 diff)
• HTMLPlug.pm (modified) (4 diffs)
• ImagePlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -69 +69 @@
     'type' => "regexp",
     'deft' => "",
+    'reqd' => "no" },
+      { 'name' => "smart_block",
+    'desc' => "{BasPlug.smart_block}",
+    'type' => "flag",
     'reqd' => "no" },
       { 'name' => "associate_ext",
@@ -428 +432 @@
 }
 
+# default implementation is to do nothing. 
+sub store_block_files
+{
+    my $self =shift (@_);
+    my ($filename) = @_;
+    return;
+}
+
+#default implementation is to block a file with same name as this, but extension jpg or JPG, if cover_images is on.
+sub block_cover_image
+{
+    my $self =shift (@_);
+    my ($filename) = @_;
+    if ($self->{'cover_image'}) {
+    my $coverfile = $filename;
+    $coverfile =~ s/\.[^\\\/\.]+$/\.jpg/;
+    if (!-e $coverfile) {
+        $coverfile =~ s/jpg$/JPG/;
+    }   
+    if (-e $coverfile) {
+        $self->{'file_blocks'}->{$coverfile} = 1;
+    }
+    }
+
+    return;
+}
+    
 sub metadata_read {
     my $self = shift (@_);  
     my ($pluginfo, $base_dir, $file, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
-
     # Keep track of filenames with same root but different extensions
-    # Used to support -assoicate_ext
+    # Used to support -associate_ext
 
     my $associate_ext = $self->{'associate_ext'};
@@ -460 +490 @@
     }
     }
-
-    return undef;
+    
+    # now check whether we are actually processing this
+    my $filename = $file;
+    $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
+    if ($self->{'process_exp'} eq "" || $filename !~ /$self->{'process_exp'}/ || !-f $filename) {
+    return undef; # can't recognise
+    }
+
+    # do smart blocking if appropriate
+    if (defined $self->{'smart_block'}) {
+    $self->block_cover_image($filename);
+    $self->store_block_files($filename);
+    }
+       
+    return 1;
 }
 

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -151 +151 @@
 
 # Go straight to BasPlug and avoid the special case implemented by HTMLPlug
-sub metadata_read {
-    return BasPlug::metadata_read(@_);
+sub store_block_files {
+    return BasPlug::store_block_files(@_);
 }
 

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -91 +91 @@
       { 'name' => "description_tags",
     'desc' => "{HTMLPlug.description_tags}",
-    'type' => "flag" } ,
+    'type' => "flag" },
       { 'name' => "no_strip_metadata_html",
     'desc' => "{HTMLPlug.no_strip_metadata_html}",
@@ -161 +161 @@
 }
 
-
-sub metadata_read {
-    my $self = shift (@_);  
-    my ($pluginfo, $base_dir, $file, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
-
-    my $outhandle = $self->{'outhandle'};
-
-    my $filename = $file;
-    $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
-
-    my ($dir) = $filename =~ /^(.*?)[^\/\\]*$/;
-
-    if ($filename !~ /$self->{'process_exp'}/ || !-f $filename) {
-    return undef; # can't recognise
-    }
-
-    if ($self->{'smart_block'}) {
-       # Do encoding stuff
-       my ($language, $encoding) = $self->textcat_get_language_encoding ($filename);
-   
-       # read in file ($text will be in utf8)
-       my $text = "";
-       $self->read_file ($filename, $encoding, $language, \$text);
-       $self->store_block_files (\$text, $filename);
-   }
-    return 1;
-}
-
 sub store_block_files
 {
     my $self =shift (@_);
-    my ($textref, $filename) = @_;
-
+    my ($filename) = @_;
     my $html_fname = $filename;
     my @file_blocks;
-
+    
+    my ($language, $encoding) = $self->textcat_get_language_encoding ($filename);
+    
+    # read in file ($text will be in utf8)
+    my $text = "";
+    $self->read_file ($filename, $encoding, $language, \$text);
+    my $textref = \$text;
     my $opencom = '(?:<!--|&lt;!(?:&mdash;|&#151;|--))';
     my $closecom = '(?:-->|(?:&mdash;|&#151;|--)&gt;)';
@@ -226 +203 @@
     }
 }
+
   
 # do plugin specific processing of doc_obj
@@ -312 +290 @@
                     # were probably introduced when converting to HTML from
                     # some other format).
-            # actually some people want to have html tags in their 
+            # actually some people want to have html tags in their
             # metadata.
             $metavalue =~ s/[\cJ\cM]/ /sg;

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -122 +122 @@
 }
 
-
+# this makes no sense for images
+sub block_cover_image
+{
+    my $self =shift (@_);
+    my ($filename) = @_;
+
+    return;
+}
 # Create the thumbnail and screenview images, and discover the Image's
 # size, width, and height using the convert utility.