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

FSN#39510 MSDAORA definitief uitfaseren

Browse Source 
svn path=/Website/trunk/; revision=32827
This commit is contained in:
Jos Groot Lipman
2017-02-15 08:37:30 +00:00
parent 8dbdd71403
commit c9593c7605
2 changed files with 19 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
APPL/Shared/xml_converter.inc
View File

@@ -177,22 +177,14 @@ function make_xml(params)
+ ", " + (params.xtrakey ? params.xtrakey : 'NULL')
+ ", " + (params.where ? safe.quoted_sql(params.where) : "''");
if (String(Oracle.RealConnection.Properties("Provider Name")).match(/OraOLEDB/i))
{
var sql = "SELECT xml.make_xml2(" + sql_params + ") xml_blob FROM dual";
var oRs = Oracle.Execute(sql);
var xml_content = oRs("xml_blob").Value;
if (!xml_content)
shared.record_not_found();
oRs.Close();
__Log("XML blob is {0} karakters.".format(xml_content.length));
}
else // MSDAORA kan niet rechtstreeks BLOB's ophalen
{
var sql = "BEGIN xml.make_xml(" + sql_params + "); END;";
Oracle.Execute(sql);
var xml_content = get_fac_xml('$AspSession$');
}
var sql = "SELECT xml.make_xml2(" + sql_params + ") xml_blob FROM dual";
var oRs = Oracle.Execute(sql);
var xml_content = oRs("xml_blob").Value;
if (!xml_content)
shared.record_not_found();
oRs.Close();
__Log("XML blob is {0} karakters.".format(xml_content.length));
if (Session("logging")&1)
__Log2File(xml_content, params.xmlnode + params.key);
return xml_content;

49
UTILS/PutOrders/puo_xmltools.js
View File

@@ -117,47 +117,20 @@ function fetchXMLContent( node
+ ", '$PutOrdersSession$'"
+ ", " + xrefkeystr
+ ", " + safe.quoted_sql(where);
var oradriver = Oracle;
if (!oradriver.Properties)
oradriver = oradriver.RealConnection; // Vanuit ASP
if (String(oradriver.Properties("Provider Name")).match(/OraOLEDB/i))
{
var sql = "SELECT xml.make_xml2(" + sql_params + ") xml_blob FROM dual";
Log2File(2, sql);
var oRs = Oracle.Execute(sql);
var xml_content = oRs("xml_blob").Value||"";
oRs.Close();
if (xml_content)
Log2File(2, "XML blob is {0} karakters.".format(xml_content.length));
else
Log2File(1, "XML blob is leeg. Verwijderd record?");
}
else // MSDAORA kan niet rechtstreeks BLOB's ophalen
{
var sql = "BEGIN xml.make_xml( " + sql_params + "); END;";
Log2File(2, sql);
Oracle.Execute(sql);
//
var sql = "SELECT fac_xml_xml"
+ " FROM fac_xml"
+ " WHERE fac_session_id = '$PutOrdersSession$'"
+ " ORDER BY fac_xml_volgnr";
Log2File(3, sql);
var xml_content_arr = [];
var oRXs = Oracle.Execute(sql);
while( !oRXs.Eof)
{
xml_content_arr.push(oRXs("fac_xml_xml").value);
oRXs.MoveNext();
}
var xml_content = xml_content_arr.join("");
oRXs.Close();
Log2File(2, "XML is {0} karakters. Opgehaald in {1} chunks.".format(xml_content.length, xml_content_arr.length));
}
var sql = "SELECT xml.make_xml2(" + sql_params + ") xml_blob FROM dual";
Log2File(2, sql);
var oRs = Oracle.Execute(sql);
var xml_content = oRs("xml_blob").Value||"";
oRs.Close();
if (xml_content)
Log2File(2, "XML blob is {0} karakters.".format(xml_content.length));
else
Log2File(1, "XML blob is leeg. Verwijderd record?");
}
catch(e)
{
Log2File(0, "Error: " + e.description);
Log2File(0, "fetchXMLContent error: " + e.description);
xml_content = "";
}
finally