Changeset 23347 for main/trunk/greenstone2/perllib/plugins/ImagePlugin.pm

Timestamp:

2010-11-26T09:43:59+13:00 (13 years ago)

Author:

davidb

Message:

Tidy up of debugging statements for handline filename encodings, plus finishing off the 'deduce_filename_encoding' routine

File:

• main/trunk/greenstone2/perllib/plugins/ImagePlugin.pm (modified) (1 diff)

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

@@ -112 +112 @@
     my $outhandle = $self->{'outhandle'};
     my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
-
+    
     if ($self->{'image_conversion_available'} == 1)
     {
-    my $filename_encoding = $self->deduce_filename_encoding($file,$metadata);
-
-#   my $utf8_filename_no_path = $self->filepath_to_utf8($filename_no_path);
-#   my $url_encoded_filename = &util::rename_file($utf8_filename_no_path, $self->{'file_rename_method'});
-
-#   $self->generate_images($filename_full_path, $url_encoded_filename, 
-#                  $doc_obj, $doc_obj->get_top_section()); # should we check the return value?
-
-    $filename_no_path = &unicode::raw_filename_to_url_encoded($filename_no_path);
-
-    # should we check the return value?
-    $self->generate_images($filename_full_path, $filename_no_path, 
-                   $doc_obj, $doc_obj->get_top_section(),$filename_encoding); 
-
+        my $plugin_filename_encoding = $self->{'filename_encoding'};
+        my $filename_encoding = $self->deduce_filename_encoding($file,$metadata,$plugin_filename_encoding);
+        
+        my $url_encoded_filename = &unicode::raw_filename_to_url_encoded($filename_no_path);
+        
+        # should we check the return value?
+        $self->generate_images($filename_full_path, $url_encoded_filename, 
+                               $doc_obj, $doc_obj->get_top_section(),$filename_encoding); 
+        
     }
     else
     {
-    if ($gli) {
-        &gsprintf(STDERR, "<Warning p='ImagePlugin' r='{ImageConverter.noconversionavailable}: {ImageConverter.".$self->{'no_image_conversion_reason'}."}'>");
-    }
-    # all we do is add the original image as an associated file, and set up srclink etc
-    my $assoc_file = $doc_obj->get_assocfile_from_sourcefile();
-    my $section = $doc_obj->get_top_section();
-
-    $doc_obj->associate_file($filename_full_path, $assoc_file, "", $section);
-
-    $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile()); 
-    # We don't know the size of the image, but the browser should display it at full size
-    $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\">");
-
-    # Add a fake thumbnail icon with the full-sized image scaled down by the browser
-    $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\" width=\"" . $self->{'thumbnailsize'} . "\">");
+        if ($gli) {
+            &gsprintf(STDERR, "<Warning p='ImagePlugin' r='{ImageConverter.noconversionavailable}: {ImageConverter.".$self->{'no_image_conversion_reason'}."}'>");
+        }
+        # all we do is add the original image as an associated file, and set up srclink etc
+        my $assoc_file = $doc_obj->get_assocfile_from_sourcefile();
+        my $section = $doc_obj->get_top_section();
+        
+        $doc_obj->associate_file($filename_full_path, $assoc_file, "", $section);
+        
+        $doc_obj->add_metadata ($section, "srclink_file", $doc_obj->get_sourcefile()); 
+        # We don't know the size of the image, but the browser should display it at full size
+        $doc_obj->add_metadata ($section, "srcicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\">");
+        
+        # Add a fake thumbnail icon with the full-sized image scaled down by the browser
+        $doc_obj->add_metadata ($section, "thumbicon", "<img src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/[srclink_file]\" width=\"" . $self->{'thumbnailsize'} . "\">");
     }
     #we have no text - adds dummy text and NoText metadata
     $self->add_dummy_text($doc_obj, $doc_obj->get_top_section());
-
+    
     return 1;
-
+    
 }