Changeset 786

Timestamp:

Aug 13, 2013, 4:24:43 PM (12 years ago)

Author:

Herwig Bauernfeind

Message:

EVFSGUI 2.5: Fix rpc bug, filter more debug messages

Location:

trunk/guitools

Files:

• evfsgui/evfsgui.vrp (modified) (1 diff)
• evfsgui/evfsgui.vrx (modified) (15 diffs)
• evfsgui/evfsgui.vry (modified) ( previous)
• shared/rxrpclib.vrs (modified) (1 diff)
• shared/smbtree.vrs (modified) (3 diffs)

trunk/guitools/evfsgui/evfsgui.vrp

@@ -8 +8 @@
 RunParameters: 
 RunDirectory: U:\Develop\Samba\trunk\guitools\evfsgui
-VRXWindow: __VREMainWindow,1,1951,2361,1012,7841
-VRXWindow: __VREFileListWindow,1,2192,7950,2665,3358
-VRXWindow: __VRESectionListWindow,1,1156,12382,12238,6914
-VRXWindow: __VREToolsWindow,0,3096,8528,5474,1669
-VRXWindow: __VREWindListWindow,1,723,8239,4963,3150
+VRXWindow: __VREMainWindow,1,1963,2361,1012,7841
+VRXWindow: __VREFileListWindow,1,2204,7950,2665,3358
+VRXWindow: __VRESectionListWindow,1,1168,12382,12238,6914
+VRXWindow: __VREToolsWindow,0,3108,8528,5474,1669
+VRXWindow: __VREWindListWindow,1,952,11611,4963,3150
 UserFile: 1
 UserWindow: Main,1
+UserWindow: SW_SETTINGS,1
 UserWindow: SW_SMBTREE,1
 UserWindow: SW_DIALOG,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -215 +215 @@
 /*:VRX         _BrowseBuildPath
 */
-_BrowseBuildPath: procedure expose options. icons. sharerh
+_BrowseBuildPath: procedure expose options. icons. samba. sharerh 
     if options.!debug == 1 then say time()' _BrowseBuildPath started'
     rh = arg(1)
@@ -343 +343 @@
 /*:VRX         _BrowseObjectOpen
 */
-_BrowseObjectOpen: procedure expose options. cd. icons. 
+_BrowseObjectOpen: procedure expose samba. options. cd. icons. 
     machine    = arg(1)
     sharename  = arg(2)
@@ -529 +529 @@
 /*:VRX         _DelSMBObjectShares
 */
-_DelSMBObjectShares: procedure expose options. SMBObj. rh 
+_DelSMBObjectShares: procedure expose samba. options. SMBObj. rh 
     /* Purpose: Delete shares for a given Object (as handle) */
 
@@ -603 +603 @@
 /*:VRX         _GetSMBObjectProperties
 */
-_GetSMBObjectProperties: procedure expose options. SMBObj. rh icon resname udatatype udatamsg parentrh icons. 
+_GetSMBObjectProperties: procedure expose samba. options. SMBObj. rh icon resname udatatype udatamsg parentrh icons. 
     if options.!debug == 1 then say time()' _GetSMBObjectProperties started'
 
@@ -663 +663 @@
 /*:VRX         _GetSMBObjectShares
 */
-_GetSMBObjectShares: procedure expose options. SMBObj. rh 
+_GetSMBObjectShares: procedure expose samba. options. SMBObj. rh 
     /* Purpose: Return stem with shares for a given Object (as handle) */
 
@@ -2084 +2084 @@
             when SMBObj.udatatype = "SERVER" then do
                 say "Server dragged!"
-                p_workgroup = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.parentrh, "Caption")
+                if SMBObj.parentrh <> "" then do /* detect server without workgroup */
+                    p_workgroup = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.parentrh, "Caption")
+                end
                 p_server    = SMBObj.resname
                 p_share     = ""
@@ -2092 +2094 @@
             when SMBObj.udatatype = "DISK" then do
                 say "Shared disk dragged!"
-                p_workgroup = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.gparentrh, "Caption")
+                if SMBObj.gparentrh <> "" then do /* detect share on a server without workgroup */
+                    p_workgroup = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.gparentrh, "Caption")
+                end
                 p_server    = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.parentrh,  "Caption")
                 parse var p_server p_server '0D0A'x .
@@ -2638 +2642 @@
 */
 Main_Create:
-    options.!debug    = 0
+    options.!debug    = 1
     if options.!debug == 1 then do
         ok = VRRedirectStdIO("ON")
@@ -2661 +2665 @@
 
     CALL _INILoad
+
+    call _TabFix 1 
+    call SW_ADVANCED_Init_Content
+    call SW_SMBTREE_Init_Content
+    call SW_CONDET_Init_Content
+    call SW_SETTINGS_Init_Content
 
     CALL Refresh
@@ -4520 +4530 @@
 SW_ABOUT_Init: 
     window = VRInfo( "Object" )
-    if( \VRIsChildOf( window, "Notebook" ) ) then do
+    if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
         call VRMethod window, "CenterWindow"
         call VRSet window, "Visible", 1
@@ -4741 +4751 @@
 SW_INFO_Init:
     window = VRInfo( "Object" )
-    if( \VRIsChildOf( window, "Notebook" ) ) then do
+    if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
         call VRMethod window, "CenterWindow"
         call VRSet window, "Visible", 1
@@ -4797 +4807 @@
 SW_LOGIN_Init:
     window = VRInfo( "Object" )
-    if( \VRIsChildOf( window, "Notebook" ) ) then do
+    if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
         call VRMethod window, "CenterWindow"
         call VRSet window, "Visible", 1
@@ -4866 +4876 @@
 SW_MOUNTPOINT_Init:
     window = VRInfo( "Object" )
-    if( \VRIsChildOf( window, "Notebook" ) ) then do
+    if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
         call VRMethod window, "CenterWindow"
         call VRSet window, "Visible", 1
@@ -4920 +4930 @@
 SW_PORTCONNECT_Init: 
     window = VRInfo( "Object" )
-    if( \VRIsChildOf( window, "Notebook" ) ) then do
+    if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
         call VRMethod window, "CenterWindow"
         call VRSet window, "Visible", 1
@@ -5119 +5129 @@
     end
 return
-
 /*:VRX         TM_AutoClose_Trigger
 */

trunk/guitools/shared/rxrpclib.vrs

@@ -448 +448 @@
         rpcline = linein(rpcinfo.!msg)
         if pos("creating default valid table",rpcline) <> 0 then iterate
+        if pos("TDB(",translate(rpcline)) <> 0 then iterate
 
         if pos("LOGON_FAILURE", rpcline) > 0 then do

trunk/guitools/shared/smbtree.vrs

@@ -83 +83 @@
                 comment = strip(comment)
                 if VRGet("CN_smbtree","View") = "IconTree" then parent = smbtree.!workgroup; else parent = ""
-                /* We make any machine as sleeping initially */
+                /* We create any machine as sleeping initially */
                 smbtree.!machine = _AddSleepingMachine(machine,comment,parent)
 
@@ -117 +117 @@
             end
             when smbtreeline.sl = "" then nop /* skip empty lines */
-            otherwise do /* possibly a new workgroup */
+            otherwise do /* possible new workgroup */
                 say '  Possible workgroup: "'smbtreeline.sl'"'
-                /* check for eventual error messages */
-                if pos("RECEIVING",translate(smbtreeline.sl)) > 0 | pos("NT_STATUS",translate(smbtreeline.sl)) > 0 then do
+                ThrowMsg = 0
+                /* Do some checks to be sure */
+                select 
+                    when pos("RECEIVING",translate(smbtreeline.sl)) > 0 then ThrowMsg = 1
+                    when pos("NT_STATUS",translate(smbtreeline.sl)) > 0 then ThrowMsg = 1
+                    when pos(" ", smbtreeline.sl) > 0 then ThrowMsg = 1
+                    when pos("=", smbtreeline.sl) > 0 then ThrowMsg = 1
+                    when pos(":", smbtreeline.sl) > 0 then ThrowMsg = 1
+                    when pos("%", smbtreeline.sl) > 0 then ThrowMsg = 1
+                    otherwise do /* it is really a new workgroup */
+                        if VRGet("CN_smbtree","View") = "IconTree" then do
+                            say "Checks passed, "smbtreeline.sl" is a workgroup!"
+                            smbtree.!workgroup = _AddWorkGroup(smbtreeline.sl)
+                            CurWG = smbtreeline.sl
+                        end
+                    end
+                end
+                if ThrowMsg = 1 then do
+                    ThrowMsg = 0
                     Msg.Type = "W"
                     Msg.Text = smbtreeline.sl
                     call _ShowMsg
-                end
-                else do /* it is really a new workgroup */
-                    if VRGet("CN_smbtree","View") = "IconTree" then do
-                        smbtree.!workgroup = _AddWorkGroup(smbtreeline.sl)
-                    end
-                    CurWG = smbtreeline.sl
                 end
             end
@@ -265 +276 @@
                 line = linein(smbmachine.I)
             end
+            /* Filter possible debug messages */
+            do while(pos("TDB(",translate(line)) > 0) | (pos("%",line) > 0) | (pos("=",line) > 0)
+                say '  Skip "'line'"'
+                line = linein(smbmachine.I)
+            end
             say '  Message "'line'"'
+            
             ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'UserData', "SERVER|"||strip(line))