--- /var/www/d5/sites/d5site/modules/swish/swish.integration.inc 2008-03-10 10:17:55.000000000 -0400 +++ /home/cwells/Desktop/swish/swish.integration.inc 2008-03-07 14:22:40.000000000 -0500 @@ -70,27 +70,27 @@ function _swish_do_text_extract($filepat switch(substr($filepath,(strlen($filepath)-4),4)) { case ".doc": $filter = variable_get('catdoc_path', '/usr/local/bin/catdoc'); - $arg = '-s8859-1 -d8859-1'.' '.escapeshellarg($filepath); + $arg = '-s8859-1 -d8859-1'.' '.$filepath; break; case ".xls": $filter = variable_get('xls2csv_path', '/usr/local/bin/xls2csv'); - $arg = escapeshellarg($filepath); + $arg = $filepath; break; case ".pdf": $filter = variable_get('pdftotext_path', '/usr/local/bin/pdftotext'); - $arg = escapeshellarg($filepath). ' ' . '-'; + $arg = $filepath. ' ' . '-'; break; case ".ppt": $filter = variable_get('ppthtml_path', '/usr/local/bin/ppthtml'); - $arg = escapeshellarg($filepath). ' ' . '-'; + $arg = $filepath. ' ' . '-'; break; case ".rtf": $filter = variable_get("unrtf_path","/usr/bin/unrtf"); - $arg = '--html ' . escapeshellarg($filepath); + $arg = '--html ' . $filepath; break; default: