From d01d9ca09da06d475706896706c02bdb9f660d3a Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Wed, 21 Sep 2016 08:42:16 +0000
Subject: [PATCH] FSN#37780 gen_import_api: Terugkoppeling verder verbeteren

svn path=/Website/trunk/; revision=30787
---
 APPL/API/api_gen_import.asp | 80 ++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 37 deletions(-)

diff --git a/APPL/API/api_gen_import.asp b/APPL/API/api_gen_import.asp
index 54f3b2ed1d..7a6d3c783f 100644
--- a/APPL/API/api_gen_import.asp
+++ b/APPL/API/api_gen_import.asp
@@ -59,7 +59,10 @@
                                                      user_key: user_key });
     }
     else
+    {
         var warn = res.warning;
+        __DoLog("Import (app_key={0}) mislukt: {1}".format(import_app_key, warn), "#ffff00");
+    }
 
     var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0");
     xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""));
@@ -70,44 +73,47 @@
     var elementResult = xmlResp.createElement("result");
     var elementResultText = xmlResp.createTextNode(warn);
     elementResult.appendChild(elementResultText);
- 
-    var elementDetails = xmlResp.createElement("details");
-        
-    var sql = "SELECT imp_log_status,"
-            + "       imp_log_omschrijving,"
-            + "       imp_log_hint"
-            + "  FROM imp_log"
-            + " WHERE fac_import_key ="+ import_key
-            + "   AND imp_log_status <> 'I'";
-    var oRs = Oracle.Execute(sql);
-    while (!oRs.Eof) 
-    {
-       var elementDetail = xmlResp.createElement("detail");
-       var elementStatus = xmlResp.createElement("status");
-       var elementStatusText = xmlResp.createTextNode(oRs("imp_log_status").Value);
-       elementStatus.appendChild(elementStatusText);
-       elementDetail.appendChild(elementStatus);
-       if (oRs("imp_log_omschrijving").Value != null )
-       {
-          var elementOms = xmlResp.createElement("omschrijving");
-          var elementOmsText = xmlResp.createTextNode(oRs("imp_log_omschrijving").Value);
-          elementOms.appendChild(elementOmsText);
-          elementDetail.appendChild(elementOms);
-       }
-       if (oRs("imp_log_hint").Value != null )
-       {
-          var elementHint = xmlResp.createElement("hint");
-          var elementHintText = xmlResp.createTextNode(oRs("imp_log_hint").Value);
-          elementHint.appendChild(elementHintText);
-          elementDetail.appendChild(elementHint);
-       }
-       elementDetails.appendChild(elementDetail);
-       oRs.moveNext();
-    }
-    oRs.Close();
-    
     FCLTElement.appendChild(elementResult);
-    FCLTElement.appendChild(elementDetails);
+
+    if (import_key > 0)
+    {
+        var elementDetails = xmlResp.createElement("details");
+        var sql = "SELECT imp_log_status,"
+                + "       imp_log_omschrijving,"
+                + "       imp_log_hint"
+                + "  FROM imp_log"
+                + " WHERE fac_import_key = " + import_key
+                + "   AND imp_log_status <> 'I'";
+        var oRs = Oracle.Execute(sql);
+        while (!oRs.Eof)
+        {
+           var elementDetail = xmlResp.createElement("detail");
+           var elementStatus = xmlResp.createElement("status");
+           var elementStatusText = xmlResp.createTextNode(oRs("imp_log_status").Value);
+           elementStatus.appendChild(elementStatusText);
+           elementDetail.appendChild(elementStatus);
+           if (oRs("imp_log_omschrijving").Value != null )
+           {
+              var elementOms = xmlResp.createElement("omschrijving");
+              var elementOmsText = xmlResp.createTextNode(oRs("imp_log_omschrijving").Value);
+              elementOms.appendChild(elementOmsText);
+              elementDetail.appendChild(elementOms);
+           }
+           if (oRs("imp_log_hint").Value != null )
+           {
+              var elementHint = xmlResp.createElement("hint");
+              var elementHintText = xmlResp.createTextNode(oRs("imp_log_hint").Value);
+              elementHint.appendChild(elementHintText);
+              elementDetail.appendChild(elementHint);
+           }
+           elementDetails.appendChild(elementDetail);
+           oRs.moveNext();
+        }
+        oRs.Close();
+
+        FCLTElement.appendChild(elementDetails);
+    }
+
     xmlResp.appendChild(FCLTElement);
 
     Response.ContentType = "text/xml";