use a modified version of xlhtml for ppt files

This commit is contained in:
SJ 2012-10-01 14:10:56 +02:00
parent 4fe041d552
commit ab29175975
4 changed files with 25 additions and 0 deletions

12
configure vendored
View File

@ -3418,6 +3418,7 @@ have_zlib="no"
pdftotext="no" pdftotext="no"
catdoc="no" catdoc="no"
catppt="no" catppt="no"
ppthtml="no"
xls2csv="no" xls2csv="no"
unrtf="no" unrtf="no"
@ -4295,6 +4296,16 @@ _ACEOF
fi fi
if test z`which ppthtml 2>/dev/null` != "z"; then
ppthtml=`which ppthtml`
cat >>confdefs.h <<_ACEOF
#define HAVE_PPTHTML "$ppthtml"
_ACEOF
fi
if test z`which xls2csv 2>/dev/null` != "z"; then if test z`which xls2csv 2>/dev/null` != "z"; then
xls2csv=`which xls2csv` xls2csv=`which xls2csv`
@ -4319,6 +4330,7 @@ echo
echo "pdftotext: $pdftotext" echo "pdftotext: $pdftotext"
echo "catdoc: $catdoc" echo "catdoc: $catdoc"
echo "catppt: $catppt" echo "catppt: $catppt"
echo "ppthtml: $ppthtml"
echo "xls2csv: $xls2csv" echo "xls2csv: $xls2csv"
echo "unrtf: $unrtf" echo "unrtf: $unrtf"

View File

@ -44,6 +44,7 @@ have_zlib="no"
pdftotext="no" pdftotext="no"
catdoc="no" catdoc="no"
catppt="no" catppt="no"
ppthtml="no"
xls2csv="no" xls2csv="no"
unrtf="no" unrtf="no"
@ -315,6 +316,12 @@ if test z`which catppt 2>/dev/null` != "z"; then
fi fi
if test z`which ppthtml 2>/dev/null` != "z"; then
ppthtml=`which ppthtml`
AC_DEFINE_UNQUOTED(HAVE_PPTHTML, "$ppthtml", [path to ppthtml])
fi
if test z`which xls2csv 2>/dev/null` != "z"; then if test z`which xls2csv 2>/dev/null` != "z"; then
xls2csv=`which xls2csv` xls2csv=`which xls2csv`
AC_DEFINE_UNQUOTED(HAVE_XLS2CSV, "$xls2csv", [path to xls2csv]) AC_DEFINE_UNQUOTED(HAVE_XLS2CSV, "$xls2csv", [path to xls2csv])
@ -331,6 +338,7 @@ echo
echo "pdftotext: $pdftotext" echo "pdftotext: $pdftotext"
echo "catdoc: $catdoc" echo "catdoc: $catdoc"
echo "catppt: $catppt" echo "catppt: $catppt"
echo "ppthtml: $ppthtml"
echo "xls2csv: $xls2csv" echo "xls2csv: $xls2csv"
echo "unrtf: $unrtf" echo "unrtf: $unrtf"

View File

@ -13,6 +13,7 @@
#undef HAVE_CATDOC #undef HAVE_CATDOC
#undef HAVE_CATPPT #undef HAVE_CATPPT
#undef HAVE_XLS2CSV #undef HAVE_XLS2CSV
#undef HAVE_PPTHTML
#undef HAVE_UNRTF #undef HAVE_UNRTF
#undef HAVE_ZIP #undef HAVE_ZIP

View File

@ -190,6 +190,10 @@ void extract_attachment_content(struct session_data *sdata, struct _state *state
if(strcmp(type, "xls") == 0) snprintf(cmd, sizeof(cmd)-1, "%s -d utf-8 %s", HAVE_XLS2CSV, filename); if(strcmp(type, "xls") == 0) snprintf(cmd, sizeof(cmd)-1, "%s -d utf-8 %s", HAVE_XLS2CSV, filename);
#endif #endif
#ifdef HAVE_PPTHTML
if(strcmp(type, "ppt") == 0) snprintf(cmd, sizeof(cmd)-1, "%s %s", HAVE_PPTHTML, filename);
#endif
#ifdef HAVE_UNRTF #ifdef HAVE_UNRTF
if(strcmp(type, "rtf") == 0) snprintf(cmd, sizeof(cmd)-1, "%s --text %s", HAVE_UNRTF, filename); if(strcmp(type, "rtf") == 0) snprintf(cmd, sizeof(cmd)-1, "%s --text %s", HAVE_UNRTF, filename);
#endif #endif