Changeset 875 for trunk/guitools/smbmon

Timestamp:

Mar 4, 2015, 10:28:25 AM (10 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: SSCC (Ticket #248), SMBMon (TDB Check page), EVFSGUI, shared library updates

Location:

trunk/guitools/smbmon

Files:

• rc/lang/smbmon_de.mkm (modified) (1 diff)
• rc/lang/smbmon_en.mkm (modified) (1 diff)
• rc/lang/smbmon_es.mkm (modified) (1 diff)
• rc/lang/smbmon_fr.mkm (modified) (1 diff)
• rc/lang/smbmon_sv.mkm (modified) (1 diff)
• smbmon.rc (modified) (2 diffs)
• smbmon.vrp (modified) (1 diff)
• smbmon.vrx (modified) (8 diffs)
• smbmon.vry (modified) ( previous)

trunk/guitools/smbmon/rc/lang/smbmon_de.mkm

@@ -25 +25 @@
 SMM0020I: Produktinformation
 SMM0021I: Die Leute hinter Samba Server fr eComStation (OS/2)
-SMM0022?: 
+SMM0022I: TDB Dateien prfen
 SMM0023?: 
 SMM0024I: Einstellungen

trunk/guitools/smbmon/rc/lang/smbmon_en.mkm

@@ -25 +25 @@
 SMM0020I: About
 SMM0021I: Samba Server for eComStation is brought to you by
-SMM0022I: 
+SMM0022I: Check TDB files
 SMM0023I: 
 SMM0024I: Settings

trunk/guitools/smbmon/rc/lang/smbmon_es.mkm

@@ -25 +25 @@
 SMM0020I: Acerca de
 SMM0021I: Servidor Samba para eComStation proporcionado por
-SMM0022I: 
+SMM0022I: Comprobar los archivos TDB
 SMM0023I: 
 SMM0024I: Preferencias

trunk/guitools/smbmon/rc/lang/smbmon_fr.mkm

@@ -27 +27 @@
 SMM0020I: · propos de
 SMM0021I: Serveur Samba pour eComStation vous est propos‚ par
-SMM0022I: 
+SMM0022I: V‚rifier fichiers TDB
 SMM0023I: 
 SMM0024I: ParamŠtres

trunk/guitools/smbmon/rc/lang/smbmon_sv.mkm

@@ -23 +23 @@
 SMM0018I: ™vervakare
 SMM0019I: N„tverket
-SMM0020I: 
-SMM0021?: 
-SMM0022?: 
+SMM0020I: Om
+SMM0021I: Samba Server f”r eComStation kommer fran
+SMM0022I: Kontrollera TDB filer
 SMM0023?: 
 SMM0024I: Inst„llningar

trunk/guitools/smbmon/smbmon.rc

@@ -1 +1 @@
 icon   1 .\rc\icons\smbmon.ico
-bitmap 2 .\rc\icons\netlabs.bmp
+bitmap 2 .\rc\icons\bww_bw.bmp
 icon 40 .\rc\icons\start_samba2.ico
 icon 41 .\rc\icons\samba_stop2.ico
@@ -11 +11 @@
 icon 48 .\rc\icons\pid.ico
 icon 49 .\rc\icons\zombie.ico
+icon 50 .\rc\icons\tag.ico
+icon 51 .\rc\icons\err.ico
 BITMAP 111 .\rc\throbber\eBall_01.bmp
 BITMAP 112 .\rc\throbber\eBall_02.bmp

trunk/guitools/smbmon/smbmon.vrp

@@ -8 +8 @@
 VRXWindow: __VREMainWindow,1,2180,3614,1024,6769
 VRXWindow: __VRESectionListWindow,1,4083,11226,7372,6589
-VRXWindow: __VREToolsWindow,1,2156,1494,5468,1669
-VRXWindow: __VREWindListWindow,1,964,11708,3132,3150
+VRXWindow: __VREToolsWindow,1,2156,1494,5477,1663
+VRXWindow: __VREWindListWindow,1,964,11708,5372,3150
 UserFile: 1
 UserWindow: Main,1
+UserWindow: SW_FILES,1
+UserWindow: SW_CHKTDB,1

trunk/guitools/smbmon/smbmon.vrx

@@ -97 +97 @@
 */
 return
+/*:VRX         _ChkTDB
+*/
+_ChkTDB: 
+
+ok = SysFileTree(etc'\samba\lock\*.TDB',tdb.,'FO')
+say etc'\samba\lock\*.TDB  'tdb.0
+
+error = 0
+ok = VRMethod("CN_CHKTDB", "RemoveRecord", "ALL")
+
+do I = 1 to tdb.0
+    RecHandle = VRMethod("CN_CHKTDB", "Addrecord")
+    TDBFile =left(filespec('N',tdb.I), 22)
+    ok = VRMethod("CN_CHKTDB", "SetFieldData", RecHandle, ChkTDBFilesFH, TDBFile, ChkTDBIconFH, "$50" )
+    address cmd '@tdbtool 'tdb.I' check 2>'tdb.I'.err 1>'tdb.I'.out'
+    out = linein(tdb.I'.out')
+    ok = stream(tdb.I'.out','c','close')
+    say out
+    if pos('integrity is OK',out) > 0 then do /* integrity is ok */
+        ok = SysFileDelete(tdb.I'.err')
+        ok = SysFileDelete(tdb.I'.out')
+        out = left(out,length(out)-1)
+        TDBRecords = substr(out, pos("and has", out) + 7,)
+        ok = VRMethod("CN_CHKTDB", "SetFieldData", RecHandle, ChkTDBStatusFH, TDBRecords )
+
+        address cmd '@tdbbackup -s.bak 'tdb.I' 2>NUL 1>NUL'
+    end
+    else do /* tdb error */
+        ok = VRMethod("CN_CHKTDB", "SetFieldData", RecHandle, ChkTDBIconFH, "$51" )
+        error = 1
+        count = 0
+        out = ""
+        do while lines(tdb.I'.err') > 0 & count < 5
+            errline = linein(tdb.I'.err')
+            select
+                /* skip unnecessary lines of log */
+                when pos("bww ",errline) > 0 then iterate
+                when pos("fcntl",errline) > 0 then iterate
+                otherwise do
+                    out = out||errline'. '
+                    count = count + 1
+                end
+            end
+        end
+        ok = VRMethod("CN_CHKTDB", "SetFieldData", RecHandle, ChkTDBStatusFH, out )
+        ok = stream(tdb.I'.err','c','close')
+    end
+
+/*
+    call charout , left(filespec('N',tdb.I), 22)
+    address cmd '@tdbtool 'tdb.I' check 2>'tdb.I'.err 1>'tdb.I'.out'
+    out = linein(tdb.I'.out')
+    ok = stream(tdb.I'.out','c','close')
+    say out
+    if pos('integrity is OK',out) = 0 then do
+        call beep 880, 20
+        address cmd '@tdbbackup -s.bak -v 'tdb.I' 2>NUL 1>NUL'
+        error = 1
+        count = 0
+        do while lines(tdb.I'.err') > 0 & count < 5
+            errline = linein(tdb.I'.err')
+            select
+                /* skip unnecessary lines of log */
+                when pos("bww ",errline) > 0 then iterate
+                when pos("fcntl",errline) > 0 then iterate
+                otherwise do
+                    say right(copies(' ',22)'Cause: 'errline'!',min(length(errline)+22,79))
+                    count = count + 1
+                end
+            end
+        end
+        ok = stream(tdb.I'.err','c','close')
+    end
+    else do
+        ok = SysFileDelete(tdb.I'.err')
+        ok = SysFileDelete(tdb.I'.out')
+        address cmd '@tdbbackup -s.bak 'tdb.I' 2>NUL 1>NUL'
+    end */
+end
+
+return
+
 /*:VRX         _ColumnShow
 */
@@ -165 +247 @@
     DStatusFH  = VRMethod( "CN_Daemons", "AddField", "String", NLVGetMessage(146) )
     DPidsFH    = VRMethod( "CN_Daemons", "AddField", "String", NLVGetMessage(130) )
+
+    /* chktdb */
+    ChkTDBFilesFH = VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(134) )
+    ChkTDBIconFH  = VRMethod( "CN_CHKTDB", "AddField", "Icon",   NLVGetMessage(146) )
+    ChkTDBStatusFH= VRMethod( "CN_CHKTDB", "AddField", "String", NLVGetMessage(151) )
 
     /* Browse tree */
@@ -1162 +1249 @@
     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(17)" ") 
 
+    w = VRLoad( "TDL_1", VRWindowPath(), "SW_CHKTDB" )
+    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(22)" ") 
+
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SETTINGS" )
     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(24)" ") 
+
+
     IF options.!debug == 1 THEN SAY time()' _TabbedDialogSetup done'
 return
@@ -1260 +1352 @@
     WPSStartStop = VRGet("CB_WPSStartStop","set")
     say 'WPSStartStop = "'WPSStartStop'"'
+return
+
+/*:VRX         CN_CHKTDB_ContextMenu
+*/
+CN_CHKTDB_ContextMenu: 
+    if VRInfo("Top") < 400 & VRGet("CN_Files", "View") = "Detail" then call _ColumnsMenu "CN_Files"
+    else do
+        RH = VRInfo("Record")
+        OH = VRInfo("Object")
+        if RH <> "" then do
+            ok = VRMethod( "Contextmenu_Files", "Popup", , , "", "PositionOnItem" )
+        end
+    end
 return
 
@@ -1841 +1946 @@
     ok = VRSet("PB_Cancel", "left",pbtn_pos + pbtn_dist * (pbtn_nr - 1))
 
+    ok = VRset("GB_CHKTDB","Top",    margin  )
+    ok = VRset("GB_CHKTDB","Left",   marginx2)
+    ok = VRset("GB_CHKTDB","Width",  pane_width - 760)
+    ok = VRset("GB_CHKTDB","Height", pane_height- 1020)
+    ok = VRset("CN_CHKTDB","Top",    margin)
+    ok = VRset("CN_CHKTDB","Left",   margin)
+    ok = VRset("CN_CHKTDB","Width",  pane_width - 760 - marginx2 )
+    ok = VRset("CN_CHKTDB","Height", pane_height- 1020- marginx2 )
+
     ok = VRset("GB_USERS","Top",    margin  )
     ok = VRset("GB_USERS","Left",   marginx2)
@@ -2043 +2157 @@
 
     say "  CurrentPageNr = "CurrentPageNr
-
-    if CurrentPageNr = 2 then do
-        ok = VRset("Pict_Throbber", "Visible", 1)
-        ok = VRset("TM_Throbber", "Enabled", 1)
-        call _RefreshTree
-    end
-    else call _Refresh
+    select
+        when CurrentPageNr = 2 then do
+            ok = VRset("Pict_Throbber", "Visible", 1)
+            ok = VRset("TM_Throbber", "Enabled", 1)
+            call _RefreshTree
+        end
+        when CurrentPageNr = 6 then do
+            call _ChkTDB
+        end
+        otherwise call _Refresh
+    end
     IF options.!debug == 1 then say time()' PB_Refresh_Click() done' 
 return
@@ -2224 +2342 @@
 return
 
+/*:VRX         SW_CHKTDB_Close
+*/
+SW_CHKTDB_Close: 
+    call SW_CHKTDB_Fini
+return
+
+/*:VRX         SW_CHKTDB_Create
+*/
+SW_CHKTDB_Create: 
+    call SW_CHKTDB_Init
+return
+
+/*:VRX         SW_CHKTDB_Fini
+*/
+SW_CHKTDB_Fini: 
+    window = VRInfo( "Window" )
+    call VRDestroy window
+    drop window
+return
+/*:VRX         SW_CHKTDB_Init
+*/
+SW_CHKTDB_Init: 
+    window = VRInfo( "Object" )
+    if( \VRIsChildOf( window, "Notebook" ) ) then do
+        call VRMethod window, "CenterWindow"
+        call VRSet window, "Visible", 1
+        call VRMethod window, "Activate"
+    end
+    drop window
+return
+
 /*:VRX         SW_DAEMONS_Close
 */
@@ -2499 +2648 @@
             nop
         end
-        when page = 6 then do /* Settings */
+        when page = 6 then do /* chkTDB */
+            say "ChkTDB"
+            call _ChkTDB
+        end
+        when page = 7 then do /* Settings */
             nop
         end