From 75bef03ac649bbb4e7c1ca09729f73d268d317e3 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 2 Feb 2009 15:55:45 +0000
Subject: [PATCH] fix for bad encoding in yacydoc.html and yacydoc.xml

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5566 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/api/yacydoc.html | 13 ++++++-------
 htroot/api/yacydoc.java | 24 ++++++++++++------------
 htroot/api/yacydoc.xml  |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/htroot/api/yacydoc.html b/htroot/api/yacydoc.html
index e644b0c62..b143cf21f 100644
--- a/htroot/api/yacydoc.html
+++ b/htroot/api/yacydoc.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <!--
@@ -13,7 +12,7 @@ you can validate it with http://validator.w3.org/
        
   <head profile="http://www.w3.org/2003/g/data-view">
     <link rel="transformation" href="http://www-sop.inria.fr/acacia/soft/RDFa2RDFXML.xsl"/>
-    <title>#[dc_title]#</</title>
+    <title>#[dc_title]#</title>
     #%env/templates/metas.template%#
   </head>
    
@@ -33,11 +32,11 @@ you can validate it with http://validator.w3.org/
   <dt>Identifier</dt><dd property="dc:Identifier">yacy:urlhash:#[dc_identifier]#</dd>
   <dt>Sprache</dt><dd property="dc:Language">#[dc_language]#</dd>
   
-  <dt>Load Date</dt><dd property="yacy:loaddate">#[yacy_loaddate]#</dt>
-  <dt>Referrer Identifier</dt><dd property="yacy:referrer.hash">yacy:urlhash:#[yacy_referrer_hash]#</dt>
-  <dt>Referrer URL</dt><dd property="yacy:referrer.url">#[yacy_referrer_url]#</dt>
-  <dt>Document size</dt><dd property="yacy:size">#[yacy_size]#</dt>
-  <dt>Number of Words</dt><dd property="yacy:words">#[yacy_words]#</dt>
+  <dt>Load Date</dt><dd property="yacy:loaddate">#[yacy_loaddate]#</dd>
+  <dt>Referrer Identifier</dt><dd property="yacy:referrer.hash">yacy:urlhash:#[yacy_referrer_hash]#</dd>
+  <dt>Referrer URL</dt><dd property="yacy:referrer.url">#[yacy_referrer_url]#</dd>
+  <dt>Document size</dt><dd property="yacy:size">#[yacy_size]#</dd>
+  <dt>Number of Words</dt><dd property="yacy:words">#[yacy_words]#</dd>
   
   </dl>
   </fieldset>
diff --git a/htroot/api/yacydoc.java b/htroot/api/yacydoc.java
index 341c4ab7a..5bb7de363 100644
--- a/htroot/api/yacydoc.java
+++ b/htroot/api/yacydoc.java
@@ -77,20 +77,20 @@ public class yacydoc {
         }
         final indexURLReference le = ((entry.referrerHash() == null) || (entry.referrerHash().length() != yacySeedDB.commonHashLength)) ? null : sb.webIndex.getURL(entry.referrerHash(), null, 0);
         
-        prop.putHTML("dc_title", comp.dc_title());
-        prop.putHTML("dc_creator", comp.dc_creator());
-        prop.putHTML("dc_description", "");
-        prop.putHTML("dc_subject", comp.dc_subject());
-        prop.putHTML("dc_publisher", comp.url().toNormalform(false, true));
-        prop.putHTML("dc_contributor", "");
-        prop.putHTML("dc_date", entry.moddate().toString());
+        prop.putXML("dc_title", comp.dc_title());
+        prop.putXML("dc_creator", comp.dc_creator());
+        prop.putXML("dc_description", "");
+        prop.putXML("dc_subject", comp.dc_subject());
+        prop.putXML("dc_publisher", comp.url().toNormalform(false, true));
+        prop.putXML("dc_contributor", "");
+        prop.putXML("dc_date", entry.moddate().toString());
         prop.put("dc_type", entry.doctype());
-        prop.putHTML("dc_identifier", urlhash);
-        prop.putHTML("dc_language", entry.language());
+        prop.putXML("dc_identifier", urlhash);
+        prop.putXML("dc_language", entry.language());
 
-        prop.putHTML("yacy_loaddate", entry.loaddate().toString());
-        prop.putHTML("yacy_referrer_hash", (le == null) ? "" : le.hash());
-        prop.putHTML("yacy_referrer_url", (le == null) ? "" : le.comp().url().toNormalform(false, true));
+        prop.putXML("yacy_loaddate", entry.loaddate().toString());
+        prop.putXML("yacy_referrer_hash", (le == null) ? "" : le.hash());
+        prop.putXML("yacy_referrer_url", (le == null) ? "" : le.comp().url().toNormalform(false, true));
         prop.put("yacy_size", entry.size());
         prop.put("yacy_words",entry.wordCount());
         
diff --git a/htroot/api/yacydoc.xml b/htroot/api/yacydoc.xml
index fbdbfb299..c4bfe4fe8 100644
--- a/htroot/api/yacydoc.xml
+++ b/htroot/api/yacydoc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE metadata [ <!ELEMENT metadata (#PCDATA)> ]>
 
 <!-- 
