Changeset 27578 for main

Timestamp:

2013-06-07T18:07:01+12:00 (11 years ago)

Author:

ak19

Message:

Doing a sort on all occurrences of readdir, so readdir lists dir contents in a consistent order across operating systems.

File:

• main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

@@ -322 +322 @@
     return -1; # error in processing
     }
-    @dir = readdir (DIR);
+    @dir = sort readdir (DIR);
     closedir (DIR);
     
@@ -407 +407 @@
     return -1; # error in processing
     }
-    @dir = readdir (DIR);
+    @dir = sort readdir (DIR);
     map { $_ = &unicode::raw_filename_to_url_encoded($_) } @dir;
     closedir (DIR);
@@ -514 +514 @@
         # Re-read the files in the directory to see if there are any new files
         last if (!opendir (DIR, $dirname));
-        my @dirnow = readdir (DIR);
+        my @dirnow = sort readdir (DIR);
         map { $_ = &unicode::raw_filename_to_url_encoded($_) } @dirnow;
         closedir (DIR);