From ee983f7ee57fe130a48affb6b8b4fb3d5743e14a Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Tue, 17 Sep 2024 07:38:48 +0000
Subject: [PATCH] FCLT#81144 gen_scheduler.bat en gen_notify.bat versimpelen

svn path=/Website/branches/v2024.2/; revision=66218
---
 UTILS/gen_notify/gen_notify.js       | 21 ++++++++++++---------
 UTILS/gen_scheduler/gen_cleanup.js   |  2 +-
 UTILS/gen_scheduler/gen_scheduler.js |  4 +---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/UTILS/gen_notify/gen_notify.js b/UTILS/gen_notify/gen_notify.js
index 99f97b0b7c..4fa518d218 100644
--- a/UTILS/gen_notify/gen_notify.js
+++ b/UTILS/gen_notify/gen_notify.js
@@ -53,26 +53,29 @@ function isOffline()
 
 if (isOffline())
 {
-    __Log("Facilitor is offline, gen_notify skipped");
+    WScript.Echo("Facilitor is offline, gen_notify skipped"); // geen __Log omdat CustId nog niet bekend is
     WScript.Quit(1);
 }
 
 var udlfile = WScript.Arguments(0);
-var CustId = WScript.Arguments(1);
-if (WScript.Arguments.length == 3)
-    var QueueId = WScript.Arguments(2);
+if (WScript.Arguments.length >= 2)
+    var QueueId = WScript.Arguments(1);
 else
     var QueueId = 'DEFAULT';
 
-__Log("Starting " + CustId + "/" + QueueId + " at " + new Date());
-
- var WshNetwork = new ActiveXObject("WScript.Network");
-__Log("User: " + WshNetwork.UserDomain + "\\" + WshNetwork.UserName);
-
 var udlstr = 'File Name='+udlfile;
 var Oracle = new ActiveXObject("ADODB.Connection");
 Oracle.Open(udlstr);
 
+var sql = "SELECT fac_version_cust FROM fac_version";
+var oRs = Oracle.Execute(sql);
+var CustId = oRs(0).Value;
+oRs.Close();
+
+__Log("Starting " + CustId + "/" + QueueId + " at " + new Date());
+var WshNetwork = new ActiveXObject("WScript.Network");
+__Log("User: " + WshNetwork.UserDomain + "\\" + WshNetwork.UserName);
+
 try
 {
     sql = "BEGIN fac.initsession(NULL); fac.putnotificationjobs('"+QueueId+"'); END;";
diff --git a/UTILS/gen_scheduler/gen_cleanup.js b/UTILS/gen_scheduler/gen_cleanup.js
index 9745f86072..3ac739cd66 100644
--- a/UTILS/gen_scheduler/gen_cleanup.js
+++ b/UTILS/gen_scheduler/gen_cleanup.js
@@ -322,7 +322,7 @@ function cleanup_temp()
 
 if (isOffline())
 {
-    __Log("FACILITOR is offline, cleanup skipped");
+    WScript.Echo("FACILITOR is offline, cleanup skipped");  // geen __Log omdat CustId nog niet bekend is
     WScript.Quit(1);
 }
 
diff --git a/UTILS/gen_scheduler/gen_scheduler.js b/UTILS/gen_scheduler/gen_scheduler.js
index 71e6cb2307..157b17a488 100644
--- a/UTILS/gen_scheduler/gen_scheduler.js
+++ b/UTILS/gen_scheduler/gen_scheduler.js
@@ -37,12 +37,10 @@ function isOffline()
 
 if (isOffline())
 {
-    __Log("FACILITOR is offline, scheduler skipped");
+    WScript.Echo("FACILITOR is offline, scheduler skipped");  // geen __Log omdat CustId nog niet bekend is
     WScript.Quit(1);
 }
 
-
-
 var udlstr = 'File Name='+str;
 var Oracle = new ActiveXObject("ADODB.Connection");
 Oracle.Open(udlstr);