Changeset 11881

Timestamp:

2006-05-30T11:11:46+12:00 (18 years ago)

Author:

kjdon

Message:

added a test for image file in case there isn't one, in process_item

File:

• trunk/gsdl/perllib/plugins/PagedImgPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/PagedImgPlug.pm

@@ -856 +856 @@
         # the page number becomes the Title
         $doc_obj->set_utf8_metadata_element($cursection, 'Title', $pagenum);
-        # process the image for this page
-        my $result = $self->process_image($dir.$imgname, $imgname, $doc_obj, $cursection, $rotate);
-        
-        if (!defined $result)
-        {
-        print "PagedImgPlug: couldn't process image \"$dir.$imgname\" for item \"$filename\"\n";
+        # process the image for this page if there is one
+        if (defined $imgname && $imgname ne "") {
+        my $result1 = $self->process_image($dir.$imgname, $imgname, $doc_obj, $cursection, $rotate);
+        
+        if (!defined $result1)
+        {
+            print "PagedImgPlug: couldn't process image \"$dir.$imgname\" for item \"$filename\"\n";
+        }
         }
-        
         # process the text file if one is there
         if (defined $txtname && $txtname ne "") {
-        $result = undef;
-        $result = $self->process_text ($dir.$txtname, $txtname, $doc_obj, $cursection);
-        if (!defined $result) {
+        my $result2 = $self->process_text ($dir.$txtname, $txtname, $doc_obj, $cursection);
+        if (!defined $result2) {
             print "PagedImgPlug: couldn't process text file \"$dir.$txtname\" for item \"$filename\"\n";
         }