Changeset 24176

Show
Ignore:
Timestamp:
20.06.2011 15:52:55 (9 years ago)
Author:
ak19
Message:

Adjustment to previous commit: docx is now added to process_exp's list of extensions recognised only if the OS is windows.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/WordPlugin.pm

    r24166 r24176  
    238238    if ($openoffice_available) { 
    239239    return q^(?i)\.(doc|dot|docx|odt|wpd)$^; 
    240     } 
    241     return q^(?i)\.(docx?|dot)$^; 
     240    } elsif ($ENV{'GSDLOS'} =~ m/^windows$/i) {  
     241        # if OS is windows, can try using docx2html vbs script to see if they have Word 2007 
     242        # if the user turns windows_scripting on 
     243        return q^(?i)\.(docx?|dot)$^; 
     244    } 
     245    return q^(?i)\.(doc|dot)$^; 
    242246} 
    243247