admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#30788 MSXML4.0 vervangen door versie 6.0

Browse Source 
svn path=/Website/branches/v5.4.3/; revision=23236
This commit is contained in:
Jos Groot Lipman
2014-11-04 12:22:03 +00:00
parent da24337e86
commit 7a16dd44f7
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
UTILS/PutOrders/puo_sendfile.js
View File

@@ -17,7 +17,7 @@ function GetExtension(xmlDoc, xslDoc)
// Company has a stylesheet defined. Use this stylesheet to generate a formatted order
var Extension = "html";
var xslt = new ActiveXObject("Msxml2.XSLTemplate.4.0");
var xslt = new ActiveXObject("Msxml2.XSLTemplate.6.0");
xslt.stylesheet = xslDoc;
var xslProc = xslt.createProcessor();
@@ -32,7 +32,7 @@ function GetExtension(xmlDoc, xslDoc)
// maar gewoon csv
// Uiteindelijk eindigde je dan met fallback naar txt!!
// var extDoc = SafeLoadTextXML(fileExt);
var extDoc = new ActiveXObject("Msxml2.DOMDocument.4.0");
var extDoc = new ActiveXObject("Msxml2.DOMDocument.6.0");
extDoc.async = false;
extDoc.loadXML(fileExt);
@@ -122,7 +122,7 @@ function connectHTTP( p_connect
// Van cxml gaan we nog weer controleren of het verzendresultaat goed is
if (p_extension == "cxml")
{
var XMLresult = new ActiveXObject("Msxml2.DOMDocument.4.0");
var XMLresult = new ActiveXObject("Msxml2.DOMDocument.6.0");
var xmlDoc = SafeLoadTextXML(SOAPresult);
TestAndRaiseAnXMLError("Error in xXML soap response", xmlDoc);
@@ -361,7 +361,7 @@ function SendOrder( p_connect
streamResult.Open();
if (extension == "xml")
{
var XMLResult = new ActiveXObject("Msxml2.DOMDocument.4.0");
var XMLResult = new ActiveXObject("Msxml2.DOMDocument.6.0");
XMLResult.async = false;
xmlDoc.transformNodeToObject(xslDoc, XMLResult);

2
UTILS/PutOrders/puo_sendsms.js
View File

@@ -27,7 +27,7 @@ function sendSMS( p_telnr
var SXH_PROXY_SET_PROXY = 2; // contante in msxml2
var SMSsend = false;
var xmlHTTP = new ActiveXObject("Msxml2.ServerXMLHTTP.4.0");
var xmlHTTP = new ActiveXObject("Msxml2.ServerXMLHTTP.6.0");
var header = "";

8
UTILS/PutOrders/puo_sendsoap.js
View File

@@ -17,10 +17,10 @@ function submitDOMXSLSOAP( p_connect
{
Log2File(2, "*> submitSOAP");
// De p_xsldoc Style moet het template SOAPEnvelope definieren!
var XMLenvelope = new ActiveXObject("Msxml2.DOMDocument.4.0");
var XMLpayloadDoc = new ActiveXObject("Msxml2.DOMDocument.4.0");
var XMLresult = new ActiveXObject("Msxml2.DOMDocument.4.0");
var XMLhttp = new ActiveXObject("Msxml2.ServerXMLHTTP.4.0");
var XMLenvelope = new ActiveXObject("Msxml2.DOMDocument.6.0");
var XMLpayloadDoc = new ActiveXObject("Msxml2.DOMDocument.6.0");
var XMLresult = new ActiveXObject("Msxml2.DOMDocument.6.0");
var XMLhttp = new ActiveXObject("Msxml2.ServerXMLHTTP.6.0");
var Base64 = new Base64Cls();
var SXH_PROXY_SET_PROXY = 2; // contante in msxml2
//

6
UTILS/PutOrders/puo_xmltools.js
View File

@@ -41,7 +41,7 @@ function TestAndRaiseAnXMLError(p, iXml)
function SafeLoadTextXML(xmlText)
{
var iXml = new ActiveXObject("Msxml2.DOMDocument.4.0");
var iXml = new ActiveXObject("Msxml2.DOMDocument.6.0");
iXml.async = false;
iXml.loadXML(xmlText);
TestAndRaiseAnXMLError("Error in xmlData", iXml);
@@ -51,7 +51,7 @@ function SafeLoadTextXML(xmlText)
function SafeLoadFileXSL(xslPath)
{
var iXsl = new ActiveXObject("Msxml2.FreeThreadedDOMDocument.4.0"); // Moet FreeThreaded voor XSLTemplate
var iXsl = new ActiveXObject("Msxml2.FreeThreadedDOMDocument.6.0"); // Moet FreeThreaded voor XSLTemplate
iXsl.async = false;
iXsl.load(custabspath + "/" + xslPath);
TestAndRaiseAnXMLError("Error loading file " + xslPath, iXsl);
@@ -68,7 +68,7 @@ function XML2HTML( body
{
// Transform body=xml according to xslPath=xslfilenaam with optionel srtnotification parameter (e.g. RESBEV)
// Output is supposed to be a HTML string but really depends on the XSL content
var xslt = new ActiveXObject("Msxml2.XSLTemplate.4.0");
var xslt = new ActiveXObject("Msxml2.XSLTemplate.6.0");
var xslProc;
var xslDoc = SafeLoadFileXSL(xslPath);

2
UTILS/gen_import/GetCatalogus.js
View File

@@ -26,7 +26,7 @@ function GetCatalogus(CatalogURL, CatalogName, CatalogFile)
+" </catalog_request>"
+"</facilitor>";
var objXMLHTTP = new ActiveXObject("MSXML2.ServerXMLHTTP.4.0")
var objXMLHTTP = new ActiveXObject("MSXML2.ServerXMLHTTP.6.0")
var SXH_PROXY_SET_PROXY = 2;
if (debugFiddler)