Changeset 25778 for main/trunk/greenstone2

Timestamp:

2012-06-07T16:24:10+12:00 (12 years ago)

Author:

ak19

Message:

ex.ImageSize and ex.FileSize metadata were being set to the string unknown rather than the actual filesize returned by a call to imagick's identify. This was because the regex was too case-specific. Now ex.ImageSize and ex.FileSize are no longer the same: while ex.FileSize remains the bytevalue that was calculated, ex.ImageSize is now a display string.

File:

• main/trunk/greenstone2/perllib/plugins/ImageConverter.pm (modified) (5 diffs)

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

@@ -248 +248 @@
 
     # use identify to get info about the (possibly converted) image
-    my ($image_type, $image_width, $image_height, $image_size) 
+    my ($image_type, $image_width, $image_height, $image_size, $size_str) 
     = &identify($filename_full_path, $outhandle, $verbosity);
 
@@ -262 +262 @@
     $doc_obj->add_metadata ($section, "ImageWidth",  $image_width);
     $doc_obj->add_metadata ($section, "ImageHeight", $image_height);
-    $doc_obj->add_metadata ($section, "ImageSize",   $image_size);
+    $doc_obj->add_metadata ($section, "ImageSize",   $size_str);
 
     if ((defined $self->{'MaxImageWidth'}) 
@@ -467 +467 @@
     # Read the size
     my $size = "unknown";
-    if ($result =~ m/^.* ([0-9]+)b/) {
+    my $size_str="unknown";
+
+    if ($result =~ m/^.* ([0-9]+)b/i) {
+    $size_str="$1B"; # display string
     $size = $1;
     }
-    elsif ($result =~ m/^.* ([0-9]+)(\.([0-9]+))?kb?/) {
+    elsif ($result =~ m/^.* ([0-9]+)(\.([0-9]+))?kb?/i) {
+    # display string stays about the same
+    $size_str="$1";
+    $size_str.="$2" if defined $2;
+    $size_str.="KB";
+
     $size = 1024 * $1;
     if (defined($2)) {
@@ -478 +486 @@
     }
     }
-    elsif ($result =~ m/^.* ([0-9]+)(\.([0-9]+))?mb?/) {
+    elsif ($result =~ m/^.* ([0-9]+)(\.([0-9]+))?mb?/i) {
+    # display string stays about the same
+    $size_str="$1";
+    $size_str.="$2" if defined $2;
+    $size_str.="MB";
+
     $size = 1024 * 1024 * $1;
         if (defined($2)) {
@@ -485 +498 @@
             $size = int($size);
         }
-     }
-    elsif ($result =~ m/^.* (([0-9]+)(\.([0-9]+))?e\+([0-9]+))(kb|b)?/) {
+    }
+    elsif ($result =~ m/^.* ((([0-9]+)(\.([0-9]+))?e\+([0-9]+))(kb|b)?)/i) {
+    # display string stays the same
+    $size_str="$1";
+
     # Deals with file sizes on Linux of type "3.4e+02kb" where e+02 is 1*10^2.
     # 3.4e+02 therefore evaluates to 3.4 x 1 x 10^2 = 340kb.
     # Programming languages including Perl know how that 3.4e+02 is a number,
     # so we don't need to do any calculations.
-    $size = $1*1; # turn the string into a number by multiplying it by 1
+    # $2 is just the number without the kb/b at the end.
+    $size = $2*1; # turn the string into a number by multiplying it by 1
            #if we did $size = $1; $size would be merely the string "3.4e+02"
     $size = int($size); # truncate size
     }
-    print $outhandle "file: $image:\t $type, $width, $height, $size\n" 
+    print $outhandle "file: $image:\t $type, $width, $height, $size, $size_str\n" 
     if ($verbosity > 2);
 
     # Return the specs
-    return ($type, $width, $height, $size);
+    return ($type, $width, $height, $size, $size_str);
 }