Changeset 24166 for main/trunk/greenstone2/perllib

Timestamp:

2011-06-16T19:16:15+12:00 (13 years ago)

Author:

ak19

Message:

2nd and tentatively final set of changes changes to get the new docx2html functionality to work on docx files. The changes have to do with error reporting when Word is not installed/can't be found/can't be instantiated, when the script is launched with the wrong number of args and if the input file does not exist. WordPlugin now has docx as part of the default process_expression (even when OO is not installed).

File:

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

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

@@ -239 +239 @@
     return q^(?i)\.(doc|dot|docx|odt|wpd)$^;
     }
-    return q^(?i)\.(doc|dot)$^;
+    return q^(?i)\.(docx?|dot)$^;
 }