Changeset 3725

Timestamp:

Nov 22, 2019, 4:19:01 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• NepmdInfo: Fixed error message when CheckNepmdVersion failed due to connection problems.

Location:

trunk/src/netlabs

Files:

• bin/defaults.cfg (modified) (1 diff)
• macros/stdctrl.e (modified) (10 diffs)

trunk/src/netlabs/bin/defaults.cfg ¶

@@ -264 +264 @@
 \NEPMD\User\Encoding\EditCmdBefore  = 0
 
+; Check NEPMD Version
+\NEPMD\User\VersionCheck\CheckUrl = ftp://ftp.netlabs.org/pub/nepmd/version.cfg
+
 ; Spell check dictionaries
 ;    %u = URL spec

trunk/src/netlabs/macros/stdctrl.e ¶

@@ -1858 +1858 @@
          fQuery = 1
       endif
+      --dprintf( 'CheckNepmdVersion: fQuery = 'fQuery)
 
       if fQuery then
@@ -1864 +1865 @@
          call EditNepmdVersionLine( 'Checking for new version...')
 
-         CheckFileUrl = 'ftp://ftp.netlabs.org/pub/nepmd/version.cfg'
          WgetCmd = ''
          do once2 = 1 to 1
@@ -1872 +1872 @@
             endif
 
-            p1 = lastpos( '/', CheckFileUrl)
-            Name = substr( CheckFileUrl, p1 + 1)
+            KeyPathCheckUrl = '\NEPMD\User\VersionCheck\CheckUrl'
+            CheckUrl = QueryConfigKey( KeyPathCheckUrl)
+            p1 = lastpos( '/', CheckUrl)
+            Name = substr( CheckUrl, p1 + 1)
             TmpFile = GetTmpPath()''Name
             EnqTmpFile = EnquoteFileSpec( TmpFile)
@@ -1880 +1882 @@
             endif
 
-            WgetCmd = 'wget -T 2 -t 1 "'CheckFileUrl'" -O 'EnqTmpFile
+            WgetCmd = 'wget -T 2 -t 1 "'CheckUrl'" -O 'EnqTmpFile
             EpmCmd = "start epm /r 'postme VersionParseTmpFile "EnqTmpFile CurDate CurTime"'"
 
@@ -1902 +1904 @@
             insertline 'do 1'
             insertline '   '''WgetCmd''''
-            insertline '   if rc <> 0 then'
-            insertline '      leave'
+            --insertline '   if rc <> 0 then'
+            --insertline '      leave'
             insertline '   "'EpmCmd'"'
             insertline 'end'
@@ -1913 +1915 @@
 
             -- Execute CmdFile
+            --dprintf( 'CmdFile = 'CmdFile', WgetCmd = 'WgetCmd)
             'postme os2 /c /min 'CmdFile
          enddo
@@ -1936 +1939 @@
       Date     = ''
       Url      = ''
+      CheckResult = 1
 
       getfileid tmpfid, TmpFile
@@ -1990 +1994 @@
       call DeleteFile( TmpFile)
 
-      CheckResult = 0
       KeyPath = '\NEPMD\Var\VersionCheck'
 
-      --    Save as last check data to ini
+      -- Save as last check data to ini
       call WriteConfigKey( KeyPath'\Version', Version)
       call WriteConfigKey( KeyPath'\ReleaseDate', Date)
@@ -2001 +2004 @@
       call WriteConfigKey( KeyPath'\CheckDateTime', CurDate CurTime)
 
-      -- Change CheckResult to 0 (success)
-      CheckResult = 0
+      if Version = '' then
+      elseif Date = '' then
+      elseif Url = '' then
+      else
+         -- Change CheckResult to 0 (success)
+         CheckResult = 0
+      endif
       call WriteConfigKey( KeyPath'\Result', CheckResult)
 
@@ -2014 +2022 @@
    do once = 1 to 1
       KeyPath = '\NEPMD\Var\VersionCheck'
-
-      CheckResult     = QueryConfigKey( KeyPath'\Result')
-      Version         = QueryConfigKey( KeyPath'\Version')
-      ReleaseDateTime = QueryConfigKey( KeyPath'\ReleaseDateTime')
-      Url             = QueryConfigKey( KeyPath'\Url')
-      CheckDateTime   = QueryConfigKey( KeyPath'\CheckDateTime')
+      CheckResult   = QueryConfigKey( KeyPath'\Result')
+      Version       = QueryConfigKey( KeyPath'\Version')
+      ReleaseDate   = QueryConfigKey( KeyPath'\ReleaseDate')
+      Url           = QueryConfigKey( KeyPath'\Url')
+      CheckDateTime = QueryConfigKey( KeyPath'\CheckDateTime')
+
+      KeyPathCheckUrl = '\NEPMD\User\VersionCheck\CheckUrl'
+      CheckUrl = QueryConfigKey( KeyPathCheckUrl)
+      --dprintf( 'EditNepmdVersionResult: CheckResult = 'CheckResult', Version = 'Version', NepmdVersion = 'GetNepmdVersion()', ReleaseDate = 'ReleaseDate', CheckDateTime = 'CheckDateTime)
 
       CheckedOn = '(checked on 'CheckDateTime')'
-      if Url = '' then
+      if CheckResult <> 0 then
+         Text = 'Connection failed: 'CheckUrl CheckedOn
+      elseif Url = '' then
          Text = 'Check failed, URL is missing'
-      elseif CheckResult <> 0 then
-         Text = 'Connection failed: 'Url CheckedOn
       else
          if Version = GetNepmdVersion() then