From e84d94f8ca98f92a6aaa91a054e5e7fc0388b4bf Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Tue, 22 Dec 2015 17:48:24 +0100
Subject: [PATCH] fix mime table for ms office / open office documents (causing
 wrong parser detect in intranet mode)

---
 defaults/httpd.mime                              | 10 +++++++---
 source/net/yacy/document/parser/ooxmlParser.java |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/defaults/httpd.mime b/defaults/httpd.mime
index 9b763ccb5..813cae3cc 100644
--- a/defaults/httpd.mime
+++ b/defaults/httpd.mime
@@ -23,8 +23,9 @@ csv     = text/csv
 db      = application/octet-stream
 dll     = application/octet-stream
 doc     = application/msword
-docx    = application/msword
+docx    = application/vnd.openxmlformats-officedocument.wordprocessingml.document
 dot     = application/msword
+dotx    = application/vnd.openxmlformats-officedocument.wordprocessingml.template
 dvi     = application/x-dvi
 eps     = application/postscript
 exe     = application/octet-stream
@@ -82,9 +83,11 @@ phtml   = application/x-httpd-php
 pl      = text/plain
 png     = image/png
 pot     = application/mspowerpoint
+potx    = application/vnd.openxmlformats-officedocument.presentationml.template
 pps     = application/mspowerpoint
+ppsx    = application/vnd.openxmlformats-officedocument.presentationml.slideshow
 ppt     = application/mspowerpoint
-pptx    = application/mspowerpoint
+pptx    = application/vnd.openxmlformats-officedocument.presentationml.presentation
 ppz     = application/mspowerpoint
 ps      = application/postscript
 py      = text/html
@@ -128,7 +131,8 @@ wmv     = video/x-ms-wmv
 xhtml   = text/xhtml+xml
 xla     = application/msexcel
 xls     = application/msexcel
-xlsx    = application/msexcel
+xlsx    = application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+xltx    = application/vnd.openxmlformats-officedocument.spreadsheetml.template
 xpi     = application/x-xpinstall
 xsl     = text/xml
 xml     = text/xml
diff --git a/source/net/yacy/document/parser/ooxmlParser.java b/source/net/yacy/document/parser/ooxmlParser.java
index 596b54bdb..c119f642a 100644
--- a/source/net/yacy/document/parser/ooxmlParser.java
+++ b/source/net/yacy/document/parser/ooxmlParser.java
@@ -178,10 +178,10 @@ public class ooxmlParser extends AbstractParser implements Parser {
                     docKeywords,
                     singleList(docLongTitle),
                     docAuthor,
-                    "",
+                    null,
                     null,
                     descriptions,
-                    0.0f, 0.0f,
+                    0.0d, 0.0d,
                     contentBytes,
                     null,
                     null,