Changeset 346 for branches

Timestamp:

Nov 2, 2009, 3:32:44 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI Version 2.0 beta4 level code

Location:

branches/guitools-2.0

Files:

• evfsgui/changes (modified) (1 diff)
• evfsgui/evfsgui.VRP (modified) (1 diff)
• evfsgui/evfsgui.VRY (modified) ( previous)
• shared/smbtree.vrs (modified) (6 diffs)

branches/guitools-2.0/evfsgui/changes

@@ -3 +3 @@
 - Debug on/off option is badly implemented (rework required)
 - Create Icon. stem in order to ease maintainance of icons
+
+Version 2.0 beta4 2009-11-03:
+- Fixed: Do not crash on outdated temporary files
+- Fixed: Do not crash on unavailable machines
 
 Version 2.0 beta3 2009-10-29:

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -8 +8 @@
 VRXWindow: __VREMainWindow,1,1072,1783,891,3951
 VRXWindow: __VRESectionListWindow,1,602,11708,11033,3342
-VRXWindow: __VREToolsWindow,1,1963,819,6986,1661
+VRXWindow: __VREToolsWindow,1,1963,819,6992,1665
 UserFile: 1
 UserWindow: Main,1

branches/guitools-2.0/shared/smbtree.vrs

@@ -87 +87 @@
                 smbtree.!machine = VRMethod( "CN_smbtree", "AddRecord",parent,, machine||'0D0A'x||comment)
                 /* We make any machine as sleeping initially */
-                ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'Icon',"#61:PMWP.DLL")
+                ok = VRMethod( "CN_smbtree", "SetRecordAttr", smbtree.!machine, "Icon","#61:PMWP.DLL")
                 ok = VRMethod( "CN_smbtree", "SetRecordAttr", smbtree.!machine, "ReadOnly", 1)
-                ok = VRMethod( "CN_smbtree", "SetFieldData", smbtree.!machine, NBFH, machine, CommentFH, Comment, WorkGroupFH, CurWG)
+                ok = VRMethod( "CN_smbtree", "SetFieldData",  smbtree.!machine, NBFH, machine, CommentFH, Comment, WorkGroupFH, CurWG)
                 ok = VRSet( "CN_smbtree", "Painting", 0  )
                 if VRGet("CN_smbtree","View") = "Detail" then do
@@ -170 +170 @@
     say "_RefreshShares() started"
     RefreshID = RANDOM()
-    smbshares = TempDir||"smbshares."||machine
-
-    say         'detach 'samba.!smbclientexe' -L "'strip(machine)'" 'UserCred' 'debuglevel' 1>'smbshares' 2>NUL'
-    address cmd 'detach 'samba.!smbclientexe' -L "'strip(machine)'" 'UserCred' 'debuglevel' 1>'smbshares' 2>NUL'
+    smbmachine = TempDir||"smbmachine."||machine
+
+    say         'detach 'samba.!smbclientexe' -L "'strip(machine)'" 'UserCred' 'debuglevel' 1>'smbmachine' 2>NUL'
+    address cmd 'detach 'samba.!smbclientexe' -L "'strip(machine)'" 'UserCred' 'debuglevel' 1>'smbmachine' 2>NUL'
 
     RefreshMode = "SHARE"
@@ -186 +186 @@
     say "_AddSharesDisplay() started"
 
-    ok = SysFileTree(Tempdir||'smbshares.*',smbshare.,'FO')
-
-    if smbshare.0 = 0 then do /* we are done, no more files around, cleanup, disable Timer and exit */
+    ok = SysFileTree(Tempdir||'smbmachine.*',smbmachine.,'FO')
+    say ' 'smbmachine.0' file(s) to process.'
+
+    if smbmachine.0 = 0 then do /* we are done, no more files around, cleanup, disable Timer and exit */
         RefreshMode = ""
         ok = VRSet("CN_smbtree","Enabled", 1)
@@ -202 +203 @@
     if ShowHidden = 'SHOWHIDDEN' | ShowHidden = '' then ShowHidden = 0
 
-    do I = 1 to smbshare.0
-        stat = stream(smbshare.I,'c','open read')
+    do I = 1 to smbmachine.0
+        say ' Going for "'smbmachine.I'"'
+        stat = stream(smbmachine.I,'c','open read')
         if stat = "READY:" then do /* we found a readable output file */
-            Machine = VRParseFilename(smbshare.I,'E')
+            Machine = VRParseFilename(smbmachine.I,'E')
             smbtree.!machine = _GetMachinehandle(Machine)
-
-            line = linein(smbshare.I)
-            say line
+            say '  Machine (handle) = "'machine'" ('smbtree.!machine')'
+
+            if smbtree.!machine = "" then do /* invalid (old) file */
+                say "_AddSharesDisplay() exit with Invalid file found (no corresponding machine)"
+                ok = stream(smbmachine.I,'c','close')
+                ok = SysFileDelete(smbmachine.I)
+                iterate
+            end
+            line = linein(smbmachine.I)
+            say '  Answer "'line'"'
             ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'UserData', "SERVER|"||strip(line))
 
-            if left(line, 20) = "session setup failed" then do /* we see an error message */
-                say left(line, 20)
-                signal sharecleanup
+            if pos("FAIL", translate(line)) > 0 then do /* we see an error message - the term "FAIL" seems to be common to all */
+                say '_AddSharesDisplay() exit with "'line'"'
+                ok = stream(smbmachine.I,'c','close')
+                ok = SysFileDelete(smbmachine.I)
+                iterate
             end
 
             retries = 0
             do while(left(line,1) <> '09'x)
-                line = linein(smbshare.I)
+                line = linein(smbmachine.I)
                 retries = retries + 1
-                say 'Retry 'retries
+                say '  Skip 'retries' "'line'"'
                 if retries >=10 then do /* No valid output - error */
-                    signal sharecleanup
-                end
-            end
+                    say "_AddSharesDisplay() exit with invalid output error"
+                    ok = stream(smbmachine.I,'c','close')
+                    ok = SysFileDelete(smbmachine.I)
+                    leave
+                end
+            end
+            if retries >=10 then iterate
 
             /* Skip header */
-            line = linein(smbshare.I)
-            line = linein(smbshare.I)
+            line = linein(smbmachine.I)
+            line = linein(smbmachine.I)
 
             if left(line,5) = "Error" then ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'UserData', "SERVER|"||strip(line))
@@ -254 +269 @@
 
                 /* get next share */
-                line = linein(smbshare.I)
-            end
-sharecleanup:
-            say "_AddSharesDisplay() cleanup"
-            ok = stream(smbshare.I,'c','close')
-            ok = SysFileDelete(smbshare.I)
-            if ok <> 0 then say 'Failure 'ok' deleting "'smbshare.I'"!'
+                line = linein(smbmachine.I)
+            end
+
+            say "_AddSharesDisplay() success and cleanup"
+            ok = stream(smbmachine.I,'c','close')
+            ok = SysFileDelete(smbmachine.I)
+            if ok <> 0 then say 'Failure 'ok' deleting "'smbmachine.I'"!'
         end
+        else say '  Got "'stat'" for "'smbmachine.I'"'
     end
     say "_AddSharesDisplay() loop finished"
@@ -270 +286 @@
 
 _GetMachinehandle: procedure
-    Machine = arg(1)
+    Machine = translate(arg(1))
+
     ok = VRMethod("CN_smbtree", "GetRecordList", "All", rh.)
+    match = 0
 
     do I = 1 to rh.0
-
-        ResName  = VRMethod("CN_smbtree","GetRecordAttr",rh.I,"Caption")
+        ResName  = translate(VRMethod("CN_smbtree","GetRecordAttr",rh.I,"Caption"))
 
         parse var ResName  ResName '0D0A'x .
         ResName = strip(ResName)
 
-        if Machine = ResName then leave /* we got a matching name */
-    end  
+        if Machine = ResName then do /* we got a matching name */
+            match = 1
+            leave
+        end
+    end
+    if match = 0 then rh.I = "" /* return an empty handle, if there was no match */
 return rh.I