Changeset 22597 for main/trunk/greenstone2/perllib/plugins/CONTENTdmPlugin.pm

Timestamp:

2010-08-10T14:31:53+12:00 (14 years ago)

Author:

kjdon

Message:

code tidy up. rearranged how convertbinaryfile plugins set up their secondary plugins - now only set up the options for the one they are using. all subclass specific code moved out of convertbinaryfile.new into the appropriate plugin file.

File:

• main/trunk/greenstone2/perllib/plugins/CONTENTdmPlugin.pm (modified) (2 diffs)

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

@@ -44 +44 @@
 
 my $convert_to_list =
-    [ { 'name' => "auto",
-    'desc' => "{ConvertBinaryFile.convert_to.auto}" },
-      { 'name' => "html",
-    'desc' => "{ConvertBinaryFile.convert_to.html}" },
-      { 'name' => "text",
-    'desc' => "{ConvertBinaryFile.convert_to.text}" },
+    [ 
+#      {    'name' => "auto",
+#   'desc' => "{ConvertBinaryFile.convert_to.auto}" },
+#      {    'name' => "html",
+#   'desc' => "{ConvertBinaryFile.convert_to.html}" },
+#      {    'name' => "text",
+#   'desc' => "{ConvertBinaryFile.convert_to.text}" },
       { 'name' => "pagedimg",
     'desc' => "{ConvertBinaryFile.convert_to.pagedimg}"},
@@ -124 +125 @@
     $self->{'metadata_value'} = undef;
 
-    $self->{'convert_to'} = "PagedImage";
+    # do we only allow one option??
+    $self->{'convert_to'} = "pagedimg";
+    $self->{'convert_to_plugin'} = "PagedImagePlugin";
+    $self->{'convert_to_ext'} = "jpg";
+    
+    my $secondary_plugin_name = $self->{'convert_to_plugin'};
     my $secondary_plugin_options = $self->{'secondary_plugin_options'};
 
-    if (!defined $secondary_plugin_options->{'PagedImagePlugin'}){
-    $secondary_plugin_options->{'PagedImagePlugin'} = [];
-    }
-    my $pagedimg_options = $secondary_plugin_options->{'PagedImagePlugin'}; 
-    push(@$pagedimg_options, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
-    push(@$pagedimg_options, "-create_thumbnail", "true", "-create_screenview", "true");
-    push(@$pagedimg_options, "-file_rename_method", "none");
-    push(@$pagedimg_options, "-processing_tmp_files");
+    if (!defined $secondary_plugin_options->{$secondary_plugin_name}) {
+    $secondary_plugin_options->{$secondary_plugin_name} = [];
+    }
+    my $specific_options = $secondary_plugin_options->{$secondary_plugin_name};
+
+    push(@$specific_options, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
+    push(@$specific_options, "-create_thumbnail", "true", "-create_screenview", "true");
+    push(@$specific_options, "-file_rename_method", "none");
+    push(@$specific_options, "-processing_tmp_files");
+
+#    my $secondary_plugin_options = $self->{'secondary_plugin_options'};
+
+#    if (!defined $secondary_plugin_options->{'PagedImagePlugin'}){
+#   $secondary_plugin_options->{'PagedImagePlugin'} = [];
+#    }
+#    my $pagedimg_options = $secondary_plugin_options->{'PagedImagePlugin'}; 
+#    push(@$pagedimg_options, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
+#    push(@$pagedimg_options, "-create_thumbnail", "true", "-create_screenview", "true");
+#    push(@$pagedimg_options, "-file_rename_method", "none");
+#    push(@$pagedimg_options, "-processing_tmp_files");
     $self = bless $self, $class;
-
-# ***** no longer needed!
-#    # This needs to be done after blss, to $self passed to XML::Parser
-#    # can correctly resolve the right call-back methods during XML parsing
-
-
     $self->load_secondary_plugins($class,$secondary_plugin_options,$hashArgOptLists);
     return $self;