Changeset 2226

Timestamp:

2001-03-27T09:43:01+12:00 (23 years ago)

Author:

paynter

Message:

Image size metadata fixed, dummy text added, Image filename fixed.

File:

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

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -152 +152 @@
     
     if ($result =~ m/([0-9]+)x([0-9]+)=>([0-9]+)x([0-9]+)/) {
-    $doc_obj->add_metadata ($section, "ImageHeight", $1);
-    $doc_obj->add_metadata ($section, "ImageWidth", $2);
-    $doc_obj->add_metadata ($section, "ThumbHeight", $3);
-    $doc_obj->add_metadata ($section, "ThumbWidth", $4);
+    $doc_obj->add_metadata ($section, "ImageWidth", $1);
+    $doc_obj->add_metadata ($section, "ImageHeight", $2);
+    $doc_obj->add_metadata ($section, "ThumbWidth", $3);
+    $doc_obj->add_metadata ($section, "ThumbHeight", $4);
     }
     
@@ -186 +186 @@
 
     #if there's a leading directory name, eat it...
-    $file =~ s/^[^\/\\]*[\/\\]//;
+    $file =~ s/^.*[\/\\]//;
     
     $doc_obj->add_metadata ($section, "ImageType", $type);
@@ -230 +230 @@
     return undef;
     }
-    print STDERR "ImagePlug: called on \"$filename\"\n"
+    print STDERR "ImagePlug processing \"$filename\"\n"
         if $self->{'verbosity'} > 1;
 
@@ -248 +248 @@
 
     #create an empty text string so we don't break downstream plugins 
-    my $text = "";
+    my $text = "Dummy text to sidestep display bug.";
 
     # include any metadata passed in from previous plugins 
@@ -256 +256 @@
 
     # do plugin specific processing of doc_obj
-    return undef unless defined ($self->process (\$text, $pluginfo, $base_dir, $file, $metadata, $doc_obj));
+    return undef unless defined ($self->process (\$text, $pluginfo, $base_dir, 
+                         $file, $metadata, $doc_obj));
 
     # do any automatic metadata extraction
@@ -263 +264 @@
     # add an OID
     $doc_obj->set_OID();
-
-    # $doc_obj->add_text($section, "<pre>\n$text\n</pre>");
+    $doc_obj->add_text($section, $text);
 
     # process the document