From 757791335f212a189790452cb2d467c31a2ae672 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Fri, 15 Mar 2013 19:02:14 +0200
Subject: Support divelogs.de exports that include Cyrillic characters

divelogs.de sends us XML files that explicitly state that they are in
ISO-8859-1 encoding (which is true). These files contain the HTML encoded
Cyrillic characters. Once we decode those characters the resulting file is
actually UTF-8 encoded (which is a superset of ISO-8859-1). That seriously
confuses libxml when it tries to parse things.

So instead recognize divelogs.de files and skip the encoding declaration
for them before decoding the HTML encoded non-ISO-8859-1 characters.

This does show, however, that divelogs.de incorrectly truncates the
encoded strings (at least in some sample data that I created the parsing
throws errors because of that).

Reported-by: Sergey Starosek <sergey.starosek@gmail.com>
Based-on-code-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 xslt/divelogs.xslt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xslt')

diff --git a/xslt/divelogs.xslt b/xslt/divelogs.xslt
index f66ffccfe..c0585a540 100644
--- a/xslt/divelogs.xslt
+++ b/xslt/divelogs.xslt
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:strip-space elements="*"/>
-  <xsl:output method="xml" indent="yes"/>
+  <xsl:output method="xml" indent="no" encoding="UTF-8" omit-xml-declaration="yes"/>
 
   <xsl:template match="/">
     <divelog program='subsurface-import' version='2'>
-- 
cgit v1.2.3-70-g09d2