tracker r1578 - in branches/indexer-split: . filters/application filters/text

[carlosg svn gnome org]

Author: carlosg
Date: Wed Jun  4 14:46:29 2008
New Revision: 1578
URL: http://svn.gnome.org/viewvc/tracker?rev=1578&view=rev

Log:
2008-06-04  Carlos Garnacho  <carlos imendio com>

        * filters/application/*:
        * filters/text/*: Dump text in stdout instead of a temp file.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/filters/application/csv_filter
   branches/indexer-split/filters/application/msword_filter
   branches/indexer-split/filters/application/pdf_filter
   branches/indexer-split/filters/application/tab-separated-values_filter
   branches/indexer-split/filters/application/vnd.ms-excel_filter
   branches/indexer-split/filters/application/vnd.oasis.opendocument.presentation-template_filter
   branches/indexer-split/filters/application/vnd.oasis.opendocument.presentation_filter
   branches/indexer-split/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter
   branches/indexer-split/filters/application/vnd.oasis.opendocument.spreadsheet_filter
   branches/indexer-split/filters/application/vnd.oasis.opendocument.text-template_filter
   branches/indexer-split/filters/application/vnd.oasis.opendocument.text_filter
   branches/indexer-split/filters/application/vnd.stardivision.writer_filter
   branches/indexer-split/filters/application/vnd.sun.xml.calc.template_filter
   branches/indexer-split/filters/application/vnd.sun.xml.calc_filter
   branches/indexer-split/filters/application/vnd.sun.xml.draw_filter
   branches/indexer-split/filters/application/vnd.sun.xml.impress.template_filter
   branches/indexer-split/filters/application/vnd.sun.xml.impress_filter
   branches/indexer-split/filters/application/vnd.sun.xml.writer.template_filter
   branches/indexer-split/filters/application/vnd.sun.xml.writer_filter
   branches/indexer-split/filters/application/x-abiword_filter
   branches/indexer-split/filters/application/x-gnumeric_filter
   branches/indexer-split/filters/text/csv_filter
   branches/indexer-split/filters/text/djvu_filter
   branches/indexer-split/filters/text/html_filter
   branches/indexer-split/filters/text/spreadsheet_filter
   branches/indexer-split/filters/text/tab-separated-values_filter
   branches/indexer-split/filters/text/x-comma-separated-values_filter
   branches/indexer-split/filters/text/x-tex_filter
   branches/indexer-split/filters/text/xml_filter

Modified: branches/indexer-split/filters/application/csv_filter
==============================================================================
--- branches/indexer-split/filters/application/csv_filter	(original)
+++ branches/indexer-split/filters/application/csv_filter	Wed Jun  4 14:46:29 2008
@@ -4,7 +4,7 @@
 
 nice -n19 ssindex -i "$1" > "$tmpfile"
 
-nice -n19 xsltproc - "$tmpfile" > "$2" <<EOF
+nice -n19 xsltproc - "$tmpfile" <<EOF
 <?xml version="1.0"?>
 <xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";

Modified: branches/indexer-split/filters/application/msword_filter
==============================================================================
--- branches/indexer-split/filters/application/msword_filter	(original)
+++ branches/indexer-split/filters/application/msword_filter	Wed Jun  4 14:46:29 2008
@@ -3,6 +3,8 @@
 tmpdir=${TMPDIR-/tmp}
 tmpdir="$tmpdir"/tmpdir.$$
 
+tmptxtfile=`mktemp`
+
 (umask 077 && mkdir "$tmpdir") || exit 1
 
 tmpfile="$tmpdir"/tmpfile.$$
@@ -15,6 +17,8 @@
 
 cd "$tmpdir"
 
-nice -n19 wvText "$tmpfile" "$2"
+nice -n19 wvText "$tmpfile" "$tmptxtfile"
 
 rm -rf "$tmpdir"
+rm "$tmptxtfile"
+

Modified: branches/indexer-split/filters/application/pdf_filter
==============================================================================
--- branches/indexer-split/filters/application/pdf_filter	(original)
+++ branches/indexer-split/filters/application/pdf_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 pdftotext -enc UTF-8 -q -nopgbrk  "$1" "$2"
+nice -n19 pdftotext -enc UTF-8 -q -nopgbrk  "$1" -

Modified: branches/indexer-split/filters/application/tab-separated-values_filter
==============================================================================
--- branches/indexer-split/filters/application/tab-separated-values_filter	(original)
+++ branches/indexer-split/filters/application/tab-separated-values_filter	Wed Jun  4 14:46:29 2008
@@ -4,7 +4,7 @@
 
 nice -n19 ssindex -i "$1" > "$tmpfile"
 
-nice -n19 xsltproc - "$tmpfile" > "$2" <<EOF
+nice -n19 xsltproc - "$tmpfile" <<EOF
 <?xml version="1.0"?>
 <xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";

Modified: branches/indexer-split/filters/application/vnd.ms-excel_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.ms-excel_filter	(original)
+++ branches/indexer-split/filters/application/vnd.ms-excel_filter	Wed Jun  4 14:46:29 2008
@@ -4,7 +4,7 @@
 
 nice -n19 ssindex -i "$1" > "$tmpfile"
 
-nice -n19 xsltproc - "$tmpfile" > "$2" <<EOF
+nice -n19 xsltproc - "$tmpfile" <<EOF
 <?xml version="1.0"?>
 <xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";

Modified: branches/indexer-split/filters/application/vnd.oasis.opendocument.presentation-template_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.oasis.opendocument.presentation-template_filter	(original)
+++ branches/indexer-split/filters/application/vnd.oasis.opendocument.presentation-template_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.oasis.opendocument.presentation_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.oasis.opendocument.presentation_filter	(original)
+++ branches/indexer-split/filters/application/vnd.oasis.opendocument.presentation_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter	(original)
+++ branches/indexer-split/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.oasis.opendocument.spreadsheet_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.oasis.opendocument.spreadsheet_filter	(original)
+++ branches/indexer-split/filters/application/vnd.oasis.opendocument.spreadsheet_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.oasis.opendocument.text-template_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.oasis.opendocument.text-template_filter	(original)
+++ branches/indexer-split/filters/application/vnd.oasis.opendocument.text-template_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.oasis.opendocument.text_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.oasis.opendocument.text_filter	(original)
+++ branches/indexer-split/filters/application/vnd.oasis.opendocument.text_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.stardivision.writer_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.stardivision.writer_filter	(original)
+++ branches/indexer-split/filters/application/vnd.stardivision.writer_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.sun.xml.calc.template_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.sun.xml.calc.template_filter	(original)
+++ branches/indexer-split/filters/application/vnd.sun.xml.calc.template_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.sun.xml.calc_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.sun.xml.calc_filter	(original)
+++ branches/indexer-split/filters/application/vnd.sun.xml.calc_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.sun.xml.draw_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.sun.xml.draw_filter	(original)
+++ branches/indexer-split/filters/application/vnd.sun.xml.draw_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.sun.xml.impress.template_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.sun.xml.impress.template_filter	(original)
+++ branches/indexer-split/filters/application/vnd.sun.xml.impress.template_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.sun.xml.impress_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.sun.xml.impress_filter	(original)
+++ branches/indexer-split/filters/application/vnd.sun.xml.impress_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.sun.xml.writer.template_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.sun.xml.writer.template_filter	(original)
+++ branches/indexer-split/filters/application/vnd.sun.xml.writer.template_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/vnd.sun.xml.writer_filter
==============================================================================
--- branches/indexer-split/filters/application/vnd.sun.xml.writer_filter	(original)
+++ branches/indexer-split/filters/application/vnd.sun.xml.writer_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 unzip -p "$1" content.xml | o3totxt > "$2"
+nice -n19 unzip -p "$1" content.xml | o3totxt

Modified: branches/indexer-split/filters/application/x-abiword_filter
==============================================================================
--- branches/indexer-split/filters/application/x-abiword_filter	(original)
+++ branches/indexer-split/filters/application/x-abiword_filter	Wed Jun  4 14:46:29 2008
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-nice -n19 xsltproc - "$1" > "$2" <<EOF
+nice -n19 xsltproc - "$1" <<EOF
 <?xml version="1.0"?>
 <xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";

Modified: branches/indexer-split/filters/application/x-gnumeric_filter
==============================================================================
--- branches/indexer-split/filters/application/x-gnumeric_filter	(original)
+++ branches/indexer-split/filters/application/x-gnumeric_filter	Wed Jun  4 14:46:29 2008
@@ -4,7 +4,7 @@
 
 nice -n19 ssindex -i "$1" > "$tmpfile"
 
-nice -n19 xsltproc - "$tmpfile" > "$2" <<EOF
+nice -n19 xsltproc - "$tmpfile" <<EOF
 <?xml version="1.0"?>
 <xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";

Modified: branches/indexer-split/filters/text/csv_filter
==============================================================================
--- branches/indexer-split/filters/text/csv_filter	(original)
+++ branches/indexer-split/filters/text/csv_filter	Wed Jun  4 14:46:29 2008
@@ -4,7 +4,7 @@
 
 nice -n19 ssindex -i "$1" > "$tmpfile"
 
-nice -n19 xsltproc - "$tmpfile" > "$2" <<EOF
+nice -n19 xsltproc - "$tmpfile" <<EOF
 <?xml version="1.0"?>
 <xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";

Modified: branches/indexer-split/filters/text/djvu_filter
==============================================================================
--- branches/indexer-split/filters/text/djvu_filter	(original)
+++ branches/indexer-split/filters/text/djvu_filter	Wed Jun  4 14:46:29 2008
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nice -n19 djvused "$1" -e 'print-pure-txt' > "$2"
+nice -n19 djvused "$1" -e 'print-pure-txt'

Modified: branches/indexer-split/filters/text/html_filter
==============================================================================
--- branches/indexer-split/filters/text/html_filter	(original)
+++ branches/indexer-split/filters/text/html_filter	Wed Jun  4 14:46:29 2008
@@ -12,4 +12,4 @@
     -o ucs_conv=true \
     -T text/html \
     -dump \
-    "$1" > "$2"
+    "$1"

Modified: branches/indexer-split/filters/text/spreadsheet_filter
==============================================================================
--- branches/indexer-split/filters/text/spreadsheet_filter	(original)
+++ branches/indexer-split/filters/text/spreadsheet_filter	Wed Jun  4 14:46:29 2008
@@ -4,7 +4,7 @@
 
 nice -n19 ssindex -i "$1" > "$tmpfile"
 
-nice -n19 xsltproc - "$tmpfile" > "$2" <<EOF
+nice -n19 xsltproc - "$tmpfile" <<EOF
 <?xml version="1.0"?>
 <xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";

Modified: branches/indexer-split/filters/text/tab-separated-values_filter
==============================================================================
--- branches/indexer-split/filters/text/tab-separated-values_filter	(original)
+++ branches/indexer-split/filters/text/tab-separated-values_filter	Wed Jun  4 14:46:29 2008
@@ -4,7 +4,7 @@
 
 nice -n19 ssindex -i "$1" > "$tmpfile"
 
-nice -n19 xsltproc - "$tmpfile" > "$2" <<EOF
+nice -n19 xsltproc - "$tmpfile" <<EOF
 <?xml version="1.0"?>
 <xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";

Modified: branches/indexer-split/filters/text/x-comma-separated-values_filter
==============================================================================
--- branches/indexer-split/filters/text/x-comma-separated-values_filter	(original)
+++ branches/indexer-split/filters/text/x-comma-separated-values_filter	Wed Jun  4 14:46:29 2008
@@ -4,7 +4,7 @@
 
 nice -n19 ssindex -i "$1" > "$tmpfile"
 
-nice -n19 xsltproc - "$tmpfile" > "$2" <<EOF
+nice -n19 xsltproc - "$tmpfile" <<EOF
 <?xml version="1.0"?>
 <xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";

Modified: branches/indexer-split/filters/text/x-tex_filter
==============================================================================
--- branches/indexer-split/filters/text/x-tex_filter	(original)
+++ branches/indexer-split/filters/text/x-tex_filter	Wed Jun  4 14:46:29 2008
@@ -1,5 +1,5 @@
 #!/bin/sh
 UNTEX=`which untex`
-if [ -n "$UNTEX" ]; then nice -n19 $UNTEX "$1" > "$2";
-else cat "$1" > "$2";
+if [ -n "$UNTEX" ]; then nice -n19 $UNTEX "$1";
+else cat "$1";
 fi

Modified: branches/indexer-split/filters/text/xml_filter
==============================================================================
--- branches/indexer-split/filters/text/xml_filter	(original)
+++ branches/indexer-split/filters/text/xml_filter	Wed Jun  4 14:46:29 2008
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-nice -n19 xsltproc - "$1" > "$2" <<EOF
+nice -n19 xsltproc - "$1" <<EOF
 <?xml version="1.0"?>
 <xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";