Changeset 786 for trunk/guitools/shared/smbtree.vrs

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

File:

• trunk/guitools/shared/smbtree.vrs (modified) (3 diffs)

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))