AAIT#31212 output-encoding=windows-1252 beter ondersteunen bij Extended ASCII

svn path=/Website/branches/v5.4.4/; revision=23960
This commit is contained in:
Jos Groot Lipman
2015-01-27 10:57:50 +00:00
parent 6d8dfd5917
commit 4e5692b86d

View File

@@ -349,6 +349,7 @@ function SendOrder( p_connect
// Load stylesheet
Log2File(1, "Load company style: " + p_xslPath);
var xslDoc = SafeLoadFileXSL(p_xslPath);
xslDoc.setProperty("SelectionNamespaces", "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"); // verderop nodig
var xmlDoc = SafeLoadTextXML(p_xmlData);
var extension = p_extension;
@@ -361,9 +362,23 @@ function SendOrder( p_connect
var streamResult = new ActiveXObject("ADODB.Stream");
streamResult.Type = 2; // adTypeText
streamResult.Charset = 'utf-8';
// Kijk of er in de XSL naar een andere encoding wordt getransformeerd
// Naar Windows-1252 kregen we namelijk problemen bij Extended ASCII
// karakters op Windows 2008 (AAIT#31212)
if (xslDoc.selectSingleNode("//xsl:output"))
{
var enc = xslDoc.selectSingleNode("//xsl:output").getAttribute("encoding");
if (enc)
{
Log2File(2, "Forcing stream encoding to: " + enc);
streamResult.Charset = enc;
}
}
streamResult.Open();
if (extension == "xml")
{
{
result = XML2HTML( p_xmlData
, p_xslPath
, p_code