From 4b33f41c7156812946f497b2f144f901d7736792 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Thu, 9 Mar 2017 10:00:29 +0100 Subject: [PATCH] odf flat fixes --- src/sampleconf/mimeconf | 2 +- src/sampleconf/mimemap | 2 +- tests/ooff/ooff.sh | 1 + tests/ooff/ooff.txt | 9 +++++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/sampleconf/mimeconf b/src/sampleconf/mimeconf index bc403727..f7fe2cb0 100644 --- a/src/sampleconf/mimeconf +++ b/src/sampleconf/mimeconf @@ -72,8 +72,8 @@ application/vnd.oasis.opendocument.text-template = execm rclsoff.py application/vnd.oasis.opendocument.presentation = execm rclsoff.py application/vnd.oasis.opendocument.spreadsheet = execm rclsoff.py application/vnd.oasis.opendocument.graphics = execm rclsoff.py -application/vnd.oasis.opendocument.spreadsheet-flat-xml = execm rclsoff-flat.py application/vnd.oasis.opendocument.presentation-flat-xml = execm rclsoff-flat.py +application/vnd.oasis.opendocument.text-flat-xml = execm rclsoff-flat.py application/vnd.oasis.opendocument.spreadsheet-flat-xml = execm rclsoff-flat.py application/vnd.openxmlformats-officedocument.wordprocessingml.document = \ execm rclopxml.py diff --git a/src/sampleconf/mimemap b/src/sampleconf/mimemap index bf24062b..5d6e66a6 100644 --- a/src/sampleconf/mimemap +++ b/src/sampleconf/mimemap @@ -112,8 +112,8 @@ .sxg = application/vnd.sun.xml.writer.global .stw = application/vnd.sun.xml.writer.template -.fods = application/vnd.oasis.opendocument.spreadsheet-flat-xml .fodp = application/vnd.oasis.opendocument.presentation-flat-xml +.fodt = application/vnd.oasis.opendocument.text-flat-xml .fods = application/vnd.oasis.opendocument.spreadsheet-flat-xml # ms openxml diff --git a/tests/ooff/ooff.sh b/tests/ooff/ooff.sh index e19faf26..4e167599 100755 --- a/tests/ooff/ooff.sh +++ b/tests/ooff/ooff.sh @@ -9,6 +9,7 @@ initvariables $0 recollq OpenofficeWriter_uniqueterm recollq SoffTabsUnique +recollq FirstSlideUnique ) 2> $mystderr | egrep -v '^Recoll query: ' > $mystdout diff --git a/tests/ooff/ooff.txt b/tests/ooff/ooff.txt index 9cc2425d..539ac839 100644 --- a/tests/ooff/ooff.txt +++ b/tests/ooff/ooff.txt @@ -1,4 +1,9 @@ -1 results +2 results application/vnd.sun.xml.writer [file:///home/dockes/projets/fulltext/testrecoll/ooff/writer.odt] [Ceci est le titre du document openoffice élément <> "toto"] 8296 bytes -1 results +application/vnd.oasis.opendocument.text-flat-xml [file:///home/dockes/projets/fulltext/testrecoll/ooff-flat/writer-flat.fodt] [Ceci est le titre du document openoffice élément <> "toto"] 22391 bytes +2 results application/vnd.sun.xml.writer [file:///home/dockes/projets/fulltext/testrecoll/ooff/tabs.odt] [tabs.odt] 9253 bytes +application/vnd.oasis.opendocument.text-flat-xml [file:///home/dockes/projets/fulltext/testrecoll/ooff-flat/tabs.fodt] [tabs.fodt] 24830 bytes +2 results +application/vnd.sun.xml.impress [file:///home/dockes/projets/fulltext/testrecoll/ooff/Presentation.odp] [Presentation.odp] 12454 bytes +application/vnd.oasis.opendocument.presentation-flat-xml [file:///home/dockes/projets/fulltext/testrecoll/ooff-flat/Presentation.fodp] [Presentation.fodp] 69539 bytes