Changeset 19999

Timestamp:

2009-07-17T10:12:29+12:00 (15 years ago)

Author:

davidb

Message:

An empty item file caused the code to loop forever. Offending loop now corrected to exit correctly.

File:

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

gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

@@ -330 +330 @@
     my $xml_version = 0;
     open (ITEMFILE, $filename) || die "couldn't open $filename\n";
-    
+
     my $line = "";
     my $num = 0;
+
     $line = <ITEMFILE>;
-    while ($line !~ /\w/) {
+    while (defined ($line) && ($line !~ /\w/)) {
     $line = <ITEMFILE>;
     }
-    chomp $line;
-    if ($line =~ /<PagedDocument/) {
-    $xml_version = 1;
-    }
+
+    if (defined $line) {
+    chomp $line;
+    if ($line =~ /<PagedDocument/) {
+        $xml_version = 1;
+    }
+    } 
+
     close ITEMFILE; 
     return $xml_version;