Changeset 11858

Timestamp:

2006-05-25T17:17:11+12:00 (18 years ago)

Author:

kjdon

Message:

create_itemfile, had different regex for windows image files, but all seem to be the same so modified sub page_number

File:

• trunk/gsdl/bin/script/pdftoimg.pl (modified) (2 diffs)

trunk/gsdl/bin/script/pdftoimg.pl

@@ -127 +127 @@
 
     # Sort files in the directory by page_num    
-    sub page_num {
+    sub page_number {
     my ($dir) = @_;
-    my $pagenum = "";
-    if ($ENV{'GSDLOS'} =~ /^windows$/){
-       ($pagenum) =($dir =~ m/^.*\.(\d+)$/i);   
-    } else {
-       ($pagenum) =($dir =~ m/^.*-(\d+)\.(.*)$/i);
-    }
+    my ($pagenum) =($dir =~ m/^.*[-\.](\d+)(\.(jpg|gif|png))?$/i);
+    
     $pagenum = $pagenum || 1;
     return $pagenum;
@@ -140 +136 @@
 
     # sort the files in the directory in the order of page_num rather than lexically. 
-    @dir_files = sort { page_num($a) <=> page_num($b) } @dir_files;
+    @dir_files = sort { page_number($a) <=> page_number($b) } @dir_files;
 
     foreach my $file (@dir_files){
-        if ($ENV{'GSDLOS'} =~ /^windows$/ && $convert_to ne "gif"){
-      ($page_num) =($file =~ m/^.*\.(\d+)$/i); 
-    } else {
-        ($page_num) =($file =~ m/^.*-(\d+)\.(.*)/i);   
-    }
-    # as the converter will convert the document to image files start from page 0
-    $page_num =$page_num + 1 if defined $page_num;
-    $page_num = 1 unless defined $page_num;
+    $page_num = page_number($file)+1; # image numbers start at 0, so add 1
     if ($file !~ /\.item/i){
         print FILE "   <Page pagenum=\"$page_num\" imgfile=\"$file\" txtfile=\"\"/>\n";