Changeset 566

Timestamp:

Mar 6, 2011, 11:48:47 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI 2.1: Attempt to finally fix the wrong workgroup issue

Location:

branches/guitools-2.0

Files:

• evfsgui/evfsgui.VRP (modified) (1 diff)
• evfsgui/evfsgui.VRX (modified) (2 diffs)
• evfsgui/evfsgui.VRY (modified) ( previous)
• shared/smbtree.vrs (modified) (4 diffs)

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -10 +10 @@
 VRXWindow: __VREFileListWindow,1,807,11033,1590,3358
 VRXWindow: __VRESectionListWindow,1,2674,10648,8696,4794
-VRXWindow: __VREToolsWindow,1,2517,7082,6483,1663
+VRXWindow: __VREToolsWindow,1,2517,7082,6486,1665
 VRXWindow: __VREWindListWindow,1,542,8721,2650,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_ADVANCED,1
-UserWindow: SW_LOGIN,1
-UserWindow: SW_MOUNTPOINT,1
+UserWindow: SW_INFO,1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -1441 +1441 @@
     end
     if Foundserver = 0 then do
+        call _RefreshWorkgroups
         machine = VRGet("EF_SERVER","value")
         smbtree.!machine = VRMethod( "CN_SMBTREE", "AddRecord",,, machine)
@@ -1449 +1450 @@
         call _UserCredUpdate
         call _RefreshShares
+        ok = VRSet( "CN_smbtree", "Painting", 1  )
+
+        ok = VRSet("Main", 'Pointer', '<default>' )
+        ok = VRSet("CN_smbtree","Enabled", 1)
+        ok = VRSet("TM_Throbber","Enabled", 0)
+        ok = VRSet("Pict_Throbber","Visible", 0)
     end
 return

branches/guitools-2.0/shared/smbtree.vrs

@@ -232 +232 @@
         stat = stream(smbmachine.I,'c','open read')
         if stat = "READY:" then do /* we found a readable output file */
+            OneWorkGroupOnly = 0
             /* Machine = VRParseFilename(smbmachine.I,'E') */
             Machine = substr(smbmachine.I,pos('.',smbmachine.I)+1)
@@ -303 +304 @@
             end
             line = linein(smbmachine.I)
-            /* Reading workgroup and master - eventually both empty */
+            /* Reading FIRST workgroup and master - eventually both empty */
             line = linein(smbmachine.I)
+
+            /* Multiple workgroups? */
+            if lines(smbmachine.I) = 0 then OneWorkGroupOnly = 1
+                                       else OneWorkGroupOnly = 0
+            say "  OneWorkGroupOnly = "OneWorkGroupOnly
+
             parse var line '09'x workgroup master
             master = strip(master)
 
-            /* we use this to set the workgroup for manually added servers */
-            if workgroup <> "" then do
+            /* we use this to set the workgroup for manually added servers - if there is ONLY ONE workgroup */
+            if workgroup <> "" & OneWorkGroupOnly = 1 then do
                 wgh = _GetMachinehandle(workgroup)
-                if wgh = "" then do /* This machine appears to be in a new workgroup - add it as well */
+                if wgh = "" then do /* The machine appears to be in a new workgroup - add it as well */
+                    /* NOTE: This should be obsolete now because the list of available 
+                       workgroups should always have been updated before we get here */
                     wgh = VRMethod( "CN_smbtree", "AddRecord",,, workgroup,"#62:PMWP.DLL")
                     ok = VRMethod( "CN_smbtree", "SetFieldData", wgh, WorkGroupFH, workgroup)
@@ -319 +328 @@
                 end
                 /* we only do this for machines with empty parent (=workgroup) handle */
-                /* this might not be good enough yet - verifictaion required          */
+                /* IF there is only one workgroup */
+                if wgh <> "" & VRMethod('CN_smbtree', 'GetRecordAttr', smbtree.!machine, 'Parent') = "" then do
+                    ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'Parent', wgh)
+                end
+            end
+            else do /* There are multiple workgroups, we need additional */
+                    /* measures tofind out which is our workgroup */
+                say     '  'samba.!smbclientexe' -L "'Machine'" -N 'debuglevel' 2>'samba.!msg' 1>NUL'
+                address cmd samba.!smbclientexe' -L "'Machine'" -N 'debuglevel' 2>'samba.!msg' 1>NUL'
+                infoline = linein(samba.!msg)
+                if word(infoline,1) = "creating" then do /* upcase tables are missing */
+                    say "Missing upcase tables detected!"
+                    infoline = linein(samba.!msg)
+                    infoline = linein(samba.!msg)
+                end
+                IF options.!debug == 1 THEN say '  Response = "'Infoline'"'
+                ok = stream(samba.!msg,'c','close')
+                ok = SysFileDelete(samba.!msg)
+
+                parse var infoline "Domain=["WorkGroup"] "Rest
+                wgh = _GetMachinehandle(workgroup)
                 if wgh <> "" & VRMethod('CN_smbtree', 'GetRecordAttr', smbtree.!machine, 'Parent') = "" then do
                     ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'Parent', wgh)
@@ -360 +389 @@
     if match = 0 then rh.I = "" /* return an empty handle, if there was no match */
 return rh.I
+
+/*:VRX         _RefreshWorkgroups
+*/
+_RefreshWorkgroups:
+    say time()' _RefreshWorkgroups() started'
+    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
+    if BroadCast = 1 then BroadCast = '-b'; else BroadCast = ''
+
+    say         samba.!smbtreeexe' 'BroadCast' -D 'debuglevel' 'UserCred' >'samba.!msg
+    address cmd samba.!smbtreeexe' 'BroadCast' -D 'debuglevel' 'UserCred' >'samba.!msg
+
+    if BroadCast = '-b' then BroadCast = 1; else BroadCast = 0
+    if UserCred = '-N' then UserCred = ''
+
+    drop wgline.
+
+    sl = 0
+
+    do until lines(samba.!msg) = 0
+        sl = sl + 1
+        wgline.sl = linein(samba.!msg)
+    end
+    wgline.0 = sl
+    ok = stream(samba.!msg,'c','close')
+    ok = SysFileDelete(samba.!msg)
+
+    do sl = 1 to wgline.0
+       if pos("RECEIVING",translate(wgline.sl)) > 0 | pos("TDB(",translate(wgline.sl)) > 0 then do
+            iterate /* We ignore errors here */
+        end
+        workgroup = wgline.sl
+        wgh = _GetMachinehandle(workgroup)
+        if wgh = "" then do /* A new workgroup was found -- add it */
+            wgh = VRMethod( "CN_smbtree", "AddRecord",,, workgroup,"#62:PMWP.DLL")
+            ok = VRMethod( "CN_smbtree", "SetFieldData", wgh, WorkGroupFH, workgroup)
+            ok = VRMethod( "CN_smbtree", "SetRecordAttr", wgh, "Collapsed", 0)
+            ok = VRMethod( "CN_smbtree", "SetRecordAttr", wgh, "ReadOnly", 1)
+            ok = VRMethod( "CN_smbtree", 'SetRecordAttr', wgh, "UserData", "WORKGROUP|")
+        end
+    end
+    say time()' _RefreshWorkgroups() done'
+return
+