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

MARX#37896 Als API een XSL definieert dan die gebruiken als overrule van de import-xsl

Browse Source 
svn path=/Website/branches/v2016.2/; revision=30934
This commit is contained in:
Peter Feij
2016-09-30 12:59:28 +00:00
parent 8f181ad1ae
commit cdd280a93c
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/API/api_gen_import.asp
View File

@@ -48,6 +48,7 @@
customerId: customerId,
keep_old: 300, // Parallelle import 300 seconden ondersteunen
user_key: user_key,
stylesheet: API.apidata.stylesheet,
keep_backup: true // mits fac_import_app_folder gezet
});
var import_key = res.import_key;

6
APPL/IMP/imp_shared.js
View File

@@ -31,6 +31,7 @@
// van de import file gemaakt onder fac_import_app_folder/BACKUP2015/....
// Merk op: vanuit gen_import.wsf wordt keep_backup *niet* gezet
// omdat gen_import.wsf (nog) zelf de backup maakt
// stylesheet: optionele overrule van de import-XSL-stylesheet
function impReadStream(fileStream, import_app_key, params)
{
params = params || {};
@@ -114,7 +115,10 @@ function impReadStream(fileStream, import_app_key, params)
var import_action = oRs("fac_import_app_action").value;
var procprefix = oRs("fac_import_app_prefix").value||"FAC";
var charset = oRs("fac_import_app_charset").value;
var xslfile = oRs("fac_import_app_xsl").value?params.fac_home + "CUST/" + params.customerId + "/" + oRs("fac_import_app_xsl").value:"";
if (params.stylesheet) // vanuit de API bv, die is sterker
var xslfile = params.fac_home + "CUST/" + params.customerId + "/" + params.stylesheet;
else
var xslfile = oRs("fac_import_app_xsl").value?params.fac_home + "CUST/" + params.customerId + "/" + oRs("fac_import_app_xsl").value:"";
var folder = oRs("fac_import_app_folder").Value;
oRs.Close();