Changeset 1735

Timestamp:

2000-12-04T11:04:44+13:00 (23 years ago)

Author:

say1

Message:

fixed about a billion little Image things.

File:

• trunk/gsdl/perllib/plugins/ImagePlug.pm (modified) (4 diffs)

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -59 +59 @@
 
     my $result = "";
-    $result = `convert -verbose -geometry 100x100 $filename $filename.thumbnail.gif` ;
+    $result = `convert -verbose -loop 1 -delay 1 -geometry 100x100 $filename $filename.thumbnail.gif` ;
     my $section = $doc_obj->get_top_section();
 
@@ -67 +67 @@
     $doc_obj->add_metadata ($section, "ThumbHeight", $3);
     $doc_obj->add_metadata ($section, "ThumbWidth", $4);
+    }
+    my $size = "";
+    if ($result =~ m/^[^\n]* ([0-9]+)b/) {
+    $size = $1;
+    }
+    if ($result =~ m/^[^\n]* ([0-9]+)kb/) {
+    $size = 1024 * $1;
+    }
+
+    if ($result =~ m/^[^\n]*JPE?G/) {
+    $type = "jpeg";
     }
     if ($result =~ m/^[^\n]*GIF/) {
@@ -81 +92 @@
     $doc_obj->add_metadata ($section, "ImageType", $type);
     }
+    $doc_obj->add_metadata ($section, "ThumbType", "gif");
     $doc_obj->add_metadata ($section, "Image", "$file");
     $doc_obj->add_metadata ($section, "Thumb", "$file.thumbnail.gif");
-
+    if ($size != 0) {
+    $doc_obj->add_metadata ($section, "ImageSize", $size);
+    }
     print $result;
     return $type;
@@ -164 +178 @@
     my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj) = @_;
     my $outhandle = $self->{'outhandle'};
-
-    print $outhandle "ImagePlug: processing $file\n" 
-    if $self->{'verbosity'} > 1;
     
-    my $cursection = $doc_obj->get_top_section();
-    
-    # get title metadata
-    # (don't need to get title if it has been passed
-    # in from another plugin)
-    if (!defined $metadata->{'Title'}) {
-    my ($title) = $$textref =~ /^([^\n]*)/;
-    if (length($title) > 100) {
-        $title = substr ($title, 0, 100);
-    }
-    $doc_obj->add_utf8_metadata ($cursection, "Title", $title);
-    }
-    
-    # insert preformat tags and add text to document object
-    $doc_obj->add_utf8_text($cursection, "\n$$textref\n");
-
     return 1;
 }