Changeset 766

Timestamp:

Apr 5, 2013, 7:54:46 PM (12 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI 2.5, SMBMON 2.5 yet another place to fix Ticket #202

Location:

trunk/guitools

Files:

• shared/smbtree.vrs (modified) (2 diffs)
• smbmon/smbmon.vrp (modified) (1 diff)
• smbmon/smbmon.vrx (modified) (35 diffs)
• smbmon/smbmon.vry (modified) ( previous)

trunk/guitools/shared/smbtree.vrs

@@ -280 +280 @@
 
             do while(left(line,1) = '09'x) /* Share loop */
-                parse var line '09'x share type comment
-                type = translate(strip(type))
-                comment = strip(comment)
+                share   = strip(substr(line,2,16))
+                type    = translate(strip(substr(line,17,10)))
+                comment = strip(substr(line,27,))
 
                 select
@@ -294 +294 @@
                 /* Now the machine receives the wakeup icon */
                 ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'Icon', "#35:PMWP.DLL")
+                
                 parent = smbtree.!machine
                 smbtree.!share = VRMethod( "CN_smbtree", "AddRecord",parent,, share||'0D0A'x||comment, res)

trunk/guitools/smbmon/smbmon.vrp

@@ -7 +7 @@
 RunDirectory: U:\Develop\Samba\trunk\guitools\smbmon
 VRXWindow: __VREMainWindow,1,2180,3614,1024,6769
-VRXWindow: __VRESectionListWindow,1,4083,11804,7372,6047
-VRXWindow: __VREToolsWindow,1,2156,1494,6483,1659
+VRXWindow: __VRESectionListWindow,1,4083,11226,7372,6589
+VRXWindow: __VREToolsWindow,1,2156,1494,6483,1667
 VRXWindow: __VREWindListWindow,1,964,11708,3132,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_FILES,1
-UserWindow: SW_SMBTREE,1
+UserWindow: SW_DAEMONS,1

trunk/guitools/smbmon/smbmon.vrx

@@ -295 +295 @@
 */
 _GUIInit: 
-    say '_GUIInit() started'
+    IF options.!debug == 1 then say time()' _GUIInit() started'
 
     if datatype(Top) = 'NUM' then do
@@ -362 +362 @@
     
     ok = VRSet("Main", "Visible", 1)
-    say '_GUIInit() done'
+    IF options.!debug == 1 then say time()' _GUIInit() done'
 return
 
@@ -392 +392 @@
 */
 _INIRead: 
-    say '_INIRead() started.'
+    IF options.!debug == 1 then say time()' _INIRead() started'
 
     OurINI = strip(VRParseFileName(VRget("Application","Program"),'DP')'\SMBSTATUS.INI',,'\')
     ok = SysFileTree(OurINI, INIFound.,'FO')
     if INIFound.0 = 1 then OurINI = VRParseFileName(INIFound.1,'DPNE')
-    say 'OurINI='OurINI
-    HelpFile = VRParseFileName(OurINI,'DPN')'.HLP'
-    say 'HelpFile='HelpFile
+    IF options.!debug == 1 then say '  OurINI='OurINI
 
     Top   = VRGetIni( "Pos", "Top",    OurINI , 'NoClose')
@@ -448 +446 @@
     if options.!debug = "" then options.!debug = 0
 
-    if options.!Debug then ok = VRREdirectStdIO("ON")
-                      else ok = VRREdirectStdIO("OFF")
+    if options.!Debug then ok = VRRedirectStdIO("ON")
+                      else ok = VRRedirectStdIO("OFF")
 
     advanced.!bigicons = VRGetIni( "Settings", "BigIcons", OurINI)
@@ -471 +469 @@
 
     smbdoutput = TempDir'smbd.out'
-    say '_INIRead() done.'
+    IF options.!debug == 1 then say time()' _INIRead() done'
 return
 
@@ -520 +518 @@
 */
 _LoadotherFuncs: 
-    ok = VRRedirectStdIO("OFF")
+    IF options.!debug == 1 then say time()' _LoadotherFuncs() started'
+    SIGNAL ON SYNTAX NAME DLLMissing
 
     call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
@@ -528 +527 @@
     call PRLoadFuncs
 
-return
-
+    SIGNAL OFF SYNTAX
+    IF options.!debug == 1 then say time()' _LoadotherFuncs() done'
+return
+
+DLLMissing:
+    Fatal = 1
+    call VRMessage 'Main', 'REXX function library 'strip(translate(word(sourceline(SIGL-1),4),'  ',"',"))'.DLL is missing!', "EVFSGUI fatal error", "E"
+signal Quit
 /*:VRX         _MsgYesNo
 */
@@ -612 +617 @@
 */
 _Refresh: 
-    say "_Refresh() started"
+    IF options.!debug == 1 then say time()' _Refresh() started'
     ok = VRSet("TM_refresh","Enabled", 0)
     SmbNoInit = 0
@@ -651 +656 @@
 /* say '  2:'hdr2 */
     Zeile = linein(refreshoutput)
-   say '    'Zeile
+    say '    'Zeile
     if SmbNoInit then do
         call lineout samba.!msg, SambaStVer
@@ -664 +669 @@
     end
 
-    say 'SmbNoInit = 'SmbNoInit
+    say '  SmbNoInit = 'SmbNoInit
 
     /* Active users */
@@ -776 +781 @@
     end
     ok = VRSet("TM_refresh","Enabled", 1)
-    say "_Refresh() done"
+
+    IF options.!debug == 1 then say time()' _Refresh() done'
 return
 /*:VRX         _RefreshDaemons
 */
 _RefreshDaemons: 
-    say "_RefreshDaemons() started"
+    IF options.!debug == 1 then say time()' _RefreshDaemons() started'
+    ok = VRSet("TM_RefreshDaemons","Delay",3000)
+
     ok = VRSet("CN_Daemons","Painting", 0 )
-
     call VRSet VRWindow(), 'Pointer', 'Wait' 
 
@@ -904 +911 @@
     ok = VRSet("CN_Daemons","Painting", 1 )
     if Running then call _SambaUptime
-    say "_RefreshDaemons() done"
+
+    IF options.!debug == 1 then say time()' _RefreshDaemons() done'
 return
 
@@ -940 +948 @@
     ok = SysFileDelete(PingOut)
 */
+/*:VRX         _RefreshDaemonsDelay
+*/
+_RefreshDaemonsDelay: 
+    IF options.!debug == 1 then say time()' _RefreshDaemonsDelay() started'
+    IF options.!debug == 1 then say "  Old intervall = "VRGet("TM_RefreshDaemons","Delay")
+    ok = VRSet("TM_RefreshDaemons","Delay",   60000)
+    IF options.!debug == 1 then say "  New Intervall = "VRGet("TM_RefreshDaemons","Delay")
+    IF options.!debug == 1 then say time()' _RefreshDaemonsDelay() done'
+return
+
 /*:VRX         _SambaFindPIDfile
 */
 _SambaFindPIDfile: 
-    say "_SambaFindPIDfile() started"
+    IF options.!debug == 1 then say time()' _SambaFindPIDfile() started'
+
     ok = SysFileTree(ETC'\samba\pid\nmbd*pid',nmbdpid.,'FO')
-    if nmbdpid.0 = 1 then nmbdpidfile = nmbdpid.1; else nmbdpidfile = ""
-    say "  nmbdpidfile = "nmbdpidfile
-    say "_SambaFindPIDfile() done"
+    if nmbdpid.0 = 1 
+        then nmbdpidfile = nmbdpid.1; 
+        else nmbdpidfile = ""
+
+    IF options.!debug == 1 then say "  nmbdpidfile = "nmbdpidfile
+
+    IF options.!debug == 1 then say time()' _SambaFindPIDfile() done'
 return
 
@@ -1005 +1028 @@
 */
 _SambaUptime: 
-    say "_SambaUptime() started"
+    IF options.!debug == 1 then say time()' _SambaUptime() started'
     call _SambaFindPIDfile
     if nmbdpidfile = "" then do
@@ -1020 +1043 @@
     NowTime   = "2008-03-05 08:59:50" */
 
-    say StartTime
-    say NowTime
+    IF options.!debug == 1 then do
+        say "  Start Time ='"StartTime"'"
+        say "  Now   Time ='"NowTime"'"
+    end
 
     doM.0 = 12 
@@ -1032 +1057 @@
     if nY//4 = 0 & nY//400 <> 0 then doM.2 = 29
 
-    say doM.2
+    /* say doM.2 */
 
     uY =nY-sY
@@ -1053 +1078 @@
     if uM < 0 then do; uY = uY - 1; uM = uM + 12; end
 
-    say uY uM uD uH uMi uS 
+    /* say uY uM uD uH uMi uS */
 
     UpTimeStr = ' 'NlvGetMessage(43)':'
@@ -1064 +1089 @@
 
     ok = VRset("CN_Daemons", "Caption", UpTimeStr)
-    say "_SambaUptime() done"
+
+    IF options.!debug == 1 then say time()' _SambaUptime() done'
 return
 
@@ -1208 +1234 @@
 /*:VRX         CN_Daemons_Click
 */
-CN_Daemons_Click: 
-    ok = VRSet("TM_Refresh","Enabled", 0)
-    ok = VRSet("TM_RefreshDaemons","Enabled", 0)
-    ok = VRSet("PB_PAUSEDISPLAY","Caption", "Resume")
+CN_Daemons_Click:
+    IF options.!debug == 1 then say time()' CN_Daemons_Click() started' 
+    NowClickedRecord = VRInfo("Record")
+    say "  NowRecord  = '"NowClickedRecord"'"
+    say "  LastRecord = '"LastClickedRecord"'"
+    if NowClickedRecord <> LastClickedRecord then call _RefreshDaemonsDelay
+    LastClickedRecord = NowClickedRecord
+    IF options.!debug == 1 then say time()' CN_Daemons_Click() done' 
 return
 
@@ -1219 +1249 @@
     if VRInfo("Top") < 400 & VRGet("CN_Daemons", "View") = "Detail" then call _ColumnsMenu "CN_Daemons"
     else do
-        ok = VRSet("TM_Refresh","Enabled", 0)
-        ok = VRSet("TM_RefreshDaemons","Enabled", 0)
-        ok = VRSet("PB_PAUSEDISPLAY","Caption", "Resume")
+        say "  Record = '"VRInfo("Record")"'"
+
+        call _RefreshDaemonsDelay
+
         DRH = VRInfo("Record")
         OH = VRInfo("Object")
@@ -1432 +1463 @@
         address cmd 'kill -9 'DaemonName
     end
-    ok = VRSet("TM_refresh","Enabled", 1)
-    call PB_PAUSEDISPLAY_Click
+    ok = VRSet("TM_Refresh","Enabled", 1)
 return
 
@@ -1466 +1496 @@
         call _SambaShowMsg "section table registered tdb"
     end
-    ok = VRSet("TM_refresh","Enabled", 1)
-    call PB_PAUSEDISPLAY_Click
+    ok = VRSet("TM_Refresh","Enabled", 1)
 return
 
@@ -1485 +1514 @@
         address cmd samba.!smbcmd' start 'DaemonName
     end
-    ok = VRSet("TM_refresh","Enabled", 1)
-    call PB_PAUSEDISPLAY_Click
+    ok = VRSet("TM_Refresh","Enabled", 1)
 return
 
@@ -1657 +1685 @@
 /*:VRX         Main_Create
 */
-Main_Create: 
+Main_Create:
+    options.!debug    = 1
+    if options.!debug == 1 then do
+        ok = VRRedirectStdIO("ON")
+        say time()' Main_Create started'
+    end
+    else ok = VRRedirectStdIO("OFF")
+ 
     call _LoadOtherFuncs
     call _InitTempDir
@@ -1681 +1716 @@
     end */
     ok = VRMethod("PB_Refresh","SetFocus")
+
+    if options.!debug == 1 then say time()' Main_Create done'
 return
 /*:VRX         Main_Deactivate
@@ -1779 +1816 @@
     ok = VRSet("PB_Reload", "Top",    pbtn_height*5 - marginx2) 
     ok = VRSet("PB_DelLogs","Top",    pbtn_height*6 - marginx2) 
-    ok = VRSet("DT_PAUSEDISPLAY","Top",   pane_height - pbtn_height*2 -1020 - marginx2) 
-    ok = VRSet("PB_PAUSEDISPLAY","Top",   pane_height - pbtn_height -1020 - marginx2) 
 
     ok = VRSet("PB_START",  "Left",   pane_width -  760 - marginx2 - pbtn_width)
@@ -1787 +1822 @@
     ok = VRSet("PB_Reload", "Left",   pane_width -  760 - marginx2 - pbtn_width)
     ok = VRSet("PB_DelLogs","Left",   pane_width -  760 - marginx2 - pbtn_width)
-    ok = VRSet("DT_PAUSEDISPLAY","Left",  pane_width -  760 - marginx2 - pbtn_width)
-    ok = VRSet("PB_PAUSEDISPLAY","Left",  pane_width -  760 - marginx2 - pbtn_width)
 
     ok = VRset("GB_SMBTREE","Top",    margin  )
@@ -1937 +1970 @@
 return
 
-/*:VRX         PB_PAUSEDISPLAY_Click
-*/
-PB_PAUSEDISPLAY_Click: 
-    if VRGet("TM_RefreshDaemons","Enabled") then do
-        ok = VRSet("TM_RefreshDaemons","Enabled", 0)
-        ok = VRSet("PB_PAUSEDISPLAY","Caption", "Resume")
-    end
-    else do
-        ok = VRSet("TM_RefreshDaemons","Enabled", 1)
-        ok = VRSet("PB_PAUSEDISPLAY","Caption", "Pause")
-    end
-return
-
 /*:VRX         PB_Refresh_Click
 */
-PB_Refresh_Click: 
+PB_Refresh_Click:
+    IF options.!debug == 1 then say time()' PB_Refresh_Click() started' 
     ok = SysSleep(0.3)
-    page =  VRInfo("Page")
-say page
+
+    say "  CurrentPageNr = "CurrentPageNr
 
     if CurrentPageNr = 5 then do
@@ -1963 +1984 @@
     end
     else call _Refresh
+    IF options.!debug == 1 then say time()' PB_Refresh_Click() done' 
 return
 
@@ -1977 +1999 @@
     end
     ok = VRSet("TM_Refresh","Delay", 2000)
-    if \VRGet("TM_RefreshDaemons","Enabled") then call PB_PAUSEDISPLAY_Click
     call VRSet VRWindow(), 'Pointer', '<default>' 
 return
@@ -1993 +2014 @@
     end
     ok = VRSet("TM_Refresh","Delay", 1000)
-    if \VRGet("TM_RefreshDaemons","Enabled") then call PB_PAUSEDISPLAY_Click
     call VRSet VRWindow(), 'Pointer', '<default>' 
 return
@@ -2027 +2047 @@
     end
     ok = VRSet("TM_Refresh","Delay", 1000)
-    if \VRGet("TM_RefreshDaemons","Enabled") then call PB_PAUSEDISPLAY_Click
     call VRSet VRWindow(), 'Pointer', '<default>' 
     say "IPB_Start_Click done"
@@ -2044 +2063 @@
     end
     ok = VRSet("TM_Refresh","Delay", 1000)
-    if \VRGet("TM_RefreshDaemons","Enabled") then call PB_PAUSEDISPLAY_Click
     call VRSet VRWindow(), 'Pointer', '<default>' 
     say "IPB_Stop_Click done"
@@ -2408 +2426 @@
         when page = 4 then do /* daemons */
             ok = VRSet("TM_RefreshDaemons","Enabled", 1)
+            ok = VRSet("TM_RefreshDaemons","Delay",   3000)
         end
         when page = 5 then do /* smbtree */
@@ -2432 +2451 @@
 */
 TM_RefreshDaemons_Trigger: 
+    ok = VRSet("TM_RefreshDaemons","Delay", 3000)
     call _RefreshDaemons
 return