tracker r2916 - trunk/filters/application

[mbiebl svn gnome org]

Author: mbiebl
Date: Wed Feb 11 13:02:01 2009
New Revision: 2916
URL: http://svn.gnome.org/viewvc/tracker?rev=2916&view=rev

Log:
Fix msword filter

- Use mktemp to create the temp directory
- Cat the resulting text file to stdout
- Suppress any warnings from wvText (which otherwise prints them on stdout!)


Modified:
   trunk/filters/application/msword_filter

Modified: trunk/filters/application/msword_filter
==============================================================================
--- trunk/filters/application/msword_filter	(original)
+++ trunk/filters/application/msword_filter	Wed Feb 11 13:02:01 2009
@@ -1,24 +1,20 @@
 #!/bin/sh
 
-tmpdir=${TMPDIR-/tmp}
-tmpdir="$tmpdir"/tmpdir.$$
-
-tmptxtfile=`mktemp`
-
-(umask 077 && mkdir "$tmpdir") || exit 1
-
-tmpfile="$tmpdir"/tmpfile.$$
+tmpdir=`mktemp -td tracker.msword_filter.XXXXXXXXXX` || exit 1
+tmpfile="$tmpdir"/tmpfile
+tmptxtfile="$tmpdir"/tmptxtfile
 
 cp "$1" "$tmpfile"
 
-# Change the working directory to $tmpdir which we can safely deleter later.
+# Change the working directory to $tmpdir which we can safely delete later.
 # Some distributions ship a version of wvText which extracts the image files
 # from the word document and places them in the current working directory.
 
 cd "$tmpdir"
 
-nice -n19 wvText "$tmpfile" "$tmptxtfile"
+nice -n19 wvText "$tmpfile" "$tmptxtfile" > /dev/null 2>&1
+
+cat "$tmptxtfile"
 
 rm -rf "$tmpdir"
-rm "$tmptxtfile"