FSN#37431 Schijfruimte monitoring/scan_udls.asp in de core

svn path=/Website/branches/v2016.2/; revision=31074

APPL/FAC/fac_scan_aiai.asp

@@ -21,7 +21,7 @@ user.checkAutorisation("WEB_FACFAC");
 
 var fso = Server.CreateObject("Scripting.FileSystemObject")
 
-var result = {};
+var result = { svnrevision: parseInt("$Revision$".replace(/\D/g,'')) };
 // Vrije ruimte
 try
 {
@@ -64,7 +64,7 @@ if (fname)
     for (; !fc.atEnd(); fc.moveNext())
     {
         var f = fc.item();
-        var filedata = { name: f.Name, date: new Date(f.DateLastModified), size: f.Size };
+        var filedata = { name: f.Name, date: new Date(f.DateLastModified).getTime(), size: f.Size };
         if (filedata.date < new Date().getTime() - 7*24*60*60*1000) // alleen laatste week
             continue;
         filedata.url = HTTP.urlzelf() + "/temp/" + fname + "/" + f.Name;

APPL/FAC/fac_scan_cust.asp

@@ -52,10 +52,10 @@ for (; !fc1.atEnd(); fc1.moveNext())
         tmStart2 = new Date();
         var str = "File Name=" + udl;
         Oracle.Open(str);
-        result.ora = Oracle.Properties("Data source").Value;
+        result.datasource = Oracle.Properties("Data source").Value;
         result.uname = Oracle.Properties("User Name").Value;
 
-        result.logfilename = Application(fldr.Name + "_logfilename");
+        result.logfilename = Application(result.cust + "_logfilename");
         if (typeof result.logfilename == "undefined")
         {
             var sql = "SELECT fac.getsetting('fac_logfilename') FROM DUAL";
@@ -66,28 +66,19 @@ for (; !fc1.atEnd(); fc1.moveNext())
         if (result.logfilename)
             result.logfilename += ".html";
         else
-            result.logfilename = "temp/log_"+fldr.Name.toUpperCase()+".html"
+            result.logfilename = "temp/log_" + result.cust + ".html"
 
-        var sql = "select fac.getdbversion() fac_version, 'DB'||fac_version_schema fac_version_schema from fac_version";
+        var sql = "SELECT 'DB'||fac_version_schema fac_version_schema"
+                + "  FROM fac_version";
         var oRs = Oracle.Execute(sql);
-        result.facversion = oRs("fac_version").Value;
         result.schemaversion = oRs("fac_version_schema").Value;
         oRs.Close();
 
-        var sql = "select count(*) from fac_v_orderqueue";
+        var sql = "SELECT count(*) FROM fac_v_orderqueue";
         var oRs = Oracle.Execute(sql);
         result.orderqueue = oRs(0).Value;
         oRs.Close();
 
-        var sql = "SELECT max(adm_tracking_date) datum"
-                + "  FROM adm_tracking"
-                + " WHERE adm_tracking_name LIKE '%recreate.%'";
-        oRs = Oracle.Execute(sql);
-        if (!oRs.Eof && oRs("datum").Value != null)
-        {
-            result.recreate_date = new Date(oRs("datum").Value).getTime();
-        }
-        oRs.Close();
         Oracle.Close();
     }
     catch (e)
@@ -131,7 +122,8 @@ for (; !fc1.atEnd(); fc1.moveNext())
 
 result = { aFCLT: aFCLT,
            retrieved: new Date().getTime(),
-           duration : new Date().getTime() - tmStartAll
+           duration : new Date().getTime() - tmStartAll,
+           svnrevision: parseInt("$Revision$".replace(/\D/g,''))
          };
 
 var SHAinfo = findSHAinfo();

APPL/FAC/fac_scan_users.asp

@@ -20,9 +20,15 @@ var JSON_Result = true;
                recent: [] };
 
     tmStart2 = new Date();
-    result.ora = Oracle.RealConnection.Properties("Data source").Value;
+    result.datasource = Oracle.RealConnection.Properties("Data source").Value;
     result.uname = Oracle.RealConnection.Properties("User Name").Value;
 
+    var sql = "SELECT SYS_CONTEXT('USERENV','DB_NAME') dbname,"
+            + "       SYS_CONTEXT('USERENV','SERVER_HOST') server FROM DUAL";
+    var oRs = Oracle.Execute(sql);
+    result.dbdomain = oRs('dbname').Value + '@' + oRs('server').Value;
+    oRs.Close();
+
     result.logfilename = Application(customerId + "_logfilename");
     if (typeof result.logfilename == "undefined")
     {
@@ -117,6 +123,7 @@ var JSON_Result = true;
     result.duration = diff;
 
     result.retrieved = (new Date).getTime();
+    result.svnrevision = parseInt("$Revision$".replace(/\D/g,''));
 
     Response.Write(JSON.stringify(result));
 %>

APPL/FAC/fac_verify.inc

@@ -1057,6 +1057,7 @@ checker("Database context",
                     'DB_DOMAIN',
                     'DB_NAME',
                     'HOST',
+                    'SERVER_HOST',
                     'OS_USER',
                     'EXTERNAL_NAME',
                     'IP_ADDRESS',