Changeset 27970 for main

Timestamp:

2013-08-05T17:05:24+12:00 (11 years ago)

Author:

ak19

Message:

Fix to regex. The regex sorting the ordering of the generated paged_img files needed to be corrected: the extra question mark makes the match less greedy. Before, the .* would match all the characters up to but exluding the last digitbefore the file extension. Instead, we want it to match all the chars up to but excluding the first digit (in a sequence of consecutive digits) before the file extension.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -1227 +1227 @@
     sub page_number {
     my ($dir) = @_;
-    my ($pagenum) =($dir =~ m/^.*[-\.]?(\d+)(\.(jpg|gif|png))?$/i);
+    my ($pagenum) =($dir =~ m/^.*?[-\.]?(\d+)(\.(jpg|gif|png))?$/i);
+#   my ($pagenum) =($dir =~ m/(\d+)(\.(jpg|gif|png))?$/i); # this works but is not as safe/strict about input filepatterns as the above
 
     $pagenum = 1 unless defined $pagenum;