Changeset 10352

Timestamp:

2005-07-29T14:25:23+12:00 (19 years ago)

Author:

chi

Message:

Change the pagedimg_png,jpg,gif (hyphen to underscore) setting in -convert_to

File:

• trunk/gsdl/perllib/plugins/ConvertToPlug.pm (modified) (22 diffs)

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -31 +31 @@
 # secondary_plugins to devide which format to 'convert_to'. If the argument is 
 # not present, the default is to inherit auto.
-
-
 package ConvertToPlug;
 
@@ -45 +43 @@
 
 sub BEGIN {
-    @ISA = ('BasPlug');
+    @ConvertToPlug::ISA = ('BasPlug');
 }
 
@@ -55 +53 @@
       { 'name' => "text",
     'desc' => "{ConvertToPlug.convert_to.text}" },
-      { 'name' => "pagedimg-jpg",
-    'desc' => "{ConvertToPlug.convert_to.pagedimg-jpg"},
-      { 'name' => "pagedimg-gif",
-    'desc' => "{ConvertToPlug.convert_to.pagedimg-gif"},
-      { 'name' => "pagedimg-png",
-    'desc' => "{ConvertToPlug.convert_to.pagedimg-png"}, 
+      { 'name' => "pagedimg_jpg",
+    'desc' => "{ConvertToPlug.convert_to.pagedimg_jpg}"},
+      { 'name' => "pagedimg_gif",
+    'desc' => "{ConvertToPlug.convert_to.pagedimg_gif}"},
+      { 'name' => "pagedimg_png",
+    'desc' => "{ConvertToPlug.convert_to.pagedimg_png}"}, 
       ];
 
@@ -70 +68 @@
     'list' => $convert_to_list, 
     'deft' => "html" },
+      { 'name' => "title_sub",
+    'desc' => "{HTMLPlug.title_sub}",
+    'type' => "string", 
+    #'type' => "regexp",
+    'deft' => "" },
       { 'name' => "use_strings",
     'desc' => "{ConvertToPlug.use_strings}",
@@ -91 +94 @@
         'args'     => $arguments };
 
-
 sub findType
 {
@@ -118 +120 @@
 
     my @convert_to_list = split(",",$self->{'convert_to'});
-    
     $secondary_plugins = {};
 
@@ -125 +126 @@
     my $plugin_class = $convert_to."Plug";
     my $plugin_package = $plugin_class.".pm";
+
     require $plugin_package;
 
@@ -152 +154 @@
 
     my $self = {};
+
+    my $plugin_class ="";
+    
+    if ($strConvertTo =~ /pagedimg.*/i){
+    $plugin_class = "PagedImg"."Plug";
+    } else {
+    $plugin_class = uc($strConvertTo)."Plug";
+    }
+    
+    my $plugin_package = $plugin_class.".pm";
+    require $plugin_package;
+    
+    # call its constructor with extra options that we've worked out!
+    my $arglist = $plugin_options->{$plugin_class};
+    $self = (defined $hashArgOptLists)? new $plugin_class($pluginlist,$inputargs,$hashArgOptLists): new $plugin_class($pluginlist,$inputargs);
+
+
     if ($strConvertTo eq "text")
     {
-    $self = (defined $hashArgOptLists)? new TEXTPlug($pluginlist,$inputargs,$hashArgOptLists): new TEXTPlug($pluginlist,$inputargs);
+    #$self = (defined $hashArgOptLists)? new TEXTPlug($pluginlist,$inputargs,$hashArgOptLists): new TEXTPlug($pluginlist,$inputargs);
     $self->{'convert_to'} = "TEXT";
     $self->{'convert_to_ext'} = "txt";
@@ -162 +181 @@
     }
     elsif ($strConvertTo =~ /pagedimg.*/i){
-    $self = (defined $hashArgOptLists)? new PagedImgPlug($pluginlist,$inputargs,$hashArgOptLists): new PagedImgPlug($pluginlist,$inputargs);
+    #$self = (defined $hashArgOptLists)? new PagedImgPlug($pluginlist,$inputargs,$hashArgOptLists): new PagedImgPlug($pluginlist,$inputargs);
     $self->{'convert_to'} = "PagedImg";
-    #$self->{'convert_to'} = $strConvertTo;
     my $convert_to_ext = $strConvertTo;
-    $convert_to_ext =~ s/.*\-(.*)/$1/i;
+    $convert_to_ext =~ s/.*\_(.*)/$1/i;
     if ($convert_to_ext eq "gif"){
         $self->{'convert_to_ext'} = "gif";
@@ -179 +197 @@
     } else {
     # HTML or auto
-    $self = (defined $hashArgOptLists)? new HTMLPlug($pluginlist,$inputargs,$hashArgOptLists): new HTMLPlug($pluginlist,$inputargs);
+    #$self = (defined $hashArgOptLists)? new HTMLPlug($pluginlist,$inputargs,$hashArgOptLists): new HTMLPlug($pluginlist,$inputargs);
     $self->{'convert_to'} = "HTML";
     $self->{'convert_to_ext'} = "html";
@@ -219 +237 @@
 }
 
-
 sub convert_post_process
 {
@@ -239 +256 @@
     my $self = shift (@_);
     my ($output_ext, $input_filename, $textref) = @_;
-
+    
     my $outhandle = $self->{'outhandle'};
     my $convert_to = $self->{'convert_to'};
     my $failhandle = $self->{'failhandle'};
     my $convert_to_ext = $self->{'convert_to_ext'};
-
+    
     # softlink to collection tmp dir
     my $tmp_dirname 
@@ -273 +290 @@
     my $output_type="";
     if ($convert_to =~ m/PagedImg/i) {
-    $output_type = lc($convert_to)."-".lc($convert_to_ext);
+    $output_type = lc($convert_to)."_".lc($convert_to_ext);
     } else {
     $output_type = lc($convert_to);
@@ -290 +307 @@
 
     # remove symbolic link to original file
-    #&util::rm($tmp_filename);
+    &util::rm($tmp_filename);
 
     # Check STDERR here
@@ -312 +329 @@
     # store the *actual* output type and return the output filename
     # it's possible we requested conversion to html, but only to text succeeded
-    $self->{'convert_to_ext'} = $output_type;
+    #$self->{'convert_to_ext'} = $output_type;
     if ($output_type =~ /html/i) {
     $self->{'converted_to'} = "HTML";
@@ -323 +340 @@
     my $output_filename = $tmp_filename;
     if ($output_type =~ /item/i) {
-    $output_filename = $tmp_dirname . "\\$tailname\\" . $tailname . ".$output_type";
+    # running under windows
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+        $output_filename = $tmp_dirname . "\\$tailname\\" . $tailname . ".$output_type";
+    } else {
+        $output_filename = $tmp_dirname . "\/$tailname\/" . $tailname . ".$output_type";
+    }
     } else {
     $output_filename =~ s/$suffix$/.$output_type/;
@@ -337 +359 @@
     my $tmp_dirname 
     = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp");
-    #&util::rm_r($tmp_dirname);
+    &util::rm_r($tmp_dirname);
     &util::mk_dir($tmp_dirname);
 }
@@ -347 +369 @@
     my $self = shift (@_);
     my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
-#    if ($self->is_recursive()) {
-#        die "BasPlug::read function must be implemented in sub-class for recursive plugins\n";
-#    }
+    #if ($self->is_recursive()) {
+    #   die "BasPlug::read function must be implemented in sub-class for recursive plugins\n";
+    # }
 
     my $outhandle = $self->{'outhandle'};
-
+    
     my ($block_status,$filename) = $self->read_block(@_);
     return $block_status if ((!defined $block_status) || ($block_status==0));
     $file = $self->read_tidy_file($file);
-
+    
     my $output_ext = $self->{'convert_to_ext'};
-    my $conv_filename = $self->tmp_area_convert_file($output_ext, $filename);
+
+    my $conv_filename = "";
+    $conv_filename = $self->tmp_area_convert_file($output_ext, $filename);
+
     if ("$conv_filename" eq "") {return 0;} # allows continue on errors
     if (! -e "$conv_filename") {return 0;} # allows continue on errors
@@ -367 +392 @@
     my $secondary_plugins =  $self->{'secondary_plugins'};
     my $num_secondary_plugins = scalar(keys %$secondary_plugins);
+
     if ($num_secondary_plugins == 0) {
     print $outhandle "Warning: No secondary plugin to use in conversion.  Skipping $file\n";
@@ -380 +406 @@
     
     my $secondary_plugin = $secondary_plugins->{$plugin_name};
-    
+
     # note: metadata is not carried on to the next level
     my ($rv,$doc_obj) 
@@ -400 +426 @@
     my ($filemeta) = $file =~ /([^\\\/]+)$/;
     $doc_obj->set_utf8_metadata_element($doc_obj->get_top_section(), "Source", &ghtml::dmsafe($filemeta));
+
     $doc_obj->set_utf8_metadata_element($doc_obj->get_top_section(), "Plugin", "$self->{'plugin_type'}");
     $doc_obj->set_utf8_metadata_element($doc_obj->get_top_section(), "FileSize", (-s $filename));
-    
+
     # do plugin specific processing of doc_obj
     unless (defined ($self->process(undef, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli))) {
@@ -414 +441 @@
     # process the document
     $processor->process($doc_obj);
-##    $self->cleanup_tmp_area();
+    ##$self->cleanup_tmp_area();
 
     $self->{'num_processed'} ++;