Changeset 10356

Timestamp:

2005-07-29T14:35:54+12:00 (19 years ago)

Author:

chi

Message:

tidy up the code.

File:

• trunk/gsdl/perllib/plugins/StructuredHTMLPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/StructuredHTMLPlug.pm

@@ -78 +78 @@
     if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
     
-    #my $self = (defined $hashArgOptLists)? new ConvertToPlug($pluginlist,$inputargs,$hashArgOptLists): new ConvertToPlug($pluginlist,$inputargs);
     my $self = (defined $hashArgOptLists)? new HTMLPlug($pluginlist,$inputargs,$hashArgOptLists): new HTMLPlug($pluginlist,$inputargs);
     
-    print STDERR "*** StrucHTML = $self->{'assoc_files'}\n";
-
     return bless $self, $class;
 
 }
-
-#sub new
-#{
-#    my $class = shift (@_);
-#    my $self = new HTMLPlug ($class, @_);
-#    $self->{'plugin_type'} = "StructuredHTMLPlug";
-#    
-#    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
-#    my $option_list = $self->{'option_list'};
-#    push( @{$option_list}, $options );
-
-#    if (!parsargv::parse(\@_, 
-#            q^check_toc^,\$self->{'check_toc'},
-#            q^title_header/.*/^,\$self->{'title_header'},
-#                q^toc_header/.*/^,\$self->{'toc_header'},
-#            q^tof_header/.*/^,\$self->{'tof_header'},
-#            q^level1_header/.*/^,\$self->{'level1_header'},
-#            q^level2_header/.*/^,\$self->{'level2_header'},
-#            q^level3_header/.*/^,\$self->{'level3_header'}, 
-#            "allow_extra_options")) {
-#   
-#   #my $self = new HTMLPlug($class, @_);
-#   print STDERR "\nIncorrect options passed to $plugin_name, ";
-#   print STDERR "check your collect.cfg configuration file\n";
-#   $self->print_txt_usage("");  # Use default resource bundle
-#   die "\n";
-#    }
-#    return bless $self, $class;
-#}
-
 
 sub read {
@@ -366 +333 @@
         = &ImagePlug::identify($img_filename, $outhandle, $verbosity);
 
-    print STDERR "**** $actual_width x $actual_height";
-    print STDERR " (requested: $img_width x $img_height)\n";
+    #print STDERR "**** $actual_width x $actual_height";
+    #print STDERR " (requested: $img_width x $img_height)\n";
 
     if (($img_width < $actual_width) || ($img_height < $actual_height)) {
@@ -379 +346 @@
         = &util::filename_cat($dirname, $tailname."_resized".$suffix);
 
-        print STDERR "**** suffix = $suffix\n";
+        #print STDERR "**** suffix = $suffix\n";
 
         # Generate smaller image with convert