Changeset 990 for trunk/guitools/shared

Timestamp:

Dec 9, 2016, 11:06:20 AM (9 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: All changes that have built over time.

Location:

trunk/guitools/shared

Files:

• inittempdir.vrs (modified) (1 diff)
• nlv.vrs (modified) (5 diffs)
• sambainit.vrs (modified) (1 diff)
• smbtree.vrs (modified) (9 diffs)
• swat.vrs (added)

trunk/guitools/shared/inittempdir.vrs

@@ -7 +7 @@
     HaveNoTMPDIR  = 0
     TempDir       = translate(value('TMPDIR',,'OS2ENVIRONMENT'),'\','/')
-    IF options.!debug == 1 THEN say '  TMPDIR="'TempDir'"'
+    IF options.!debug == 1 THEN say '  TMPDIR = "'TempDir'"'
     if TempDir = '' then do
         HaveNoTMPDIR  = 1
         TempDir = translate(value('TEMP',,'OS2ENVIRONMENT'),'\','/')
-        IF options.!debug == 1 THEN say '  TEMP="'TempDir'"'
+        IF options.!debug == 1 THEN say '  TEMP = "'TempDir'"'
     end
     if TempDir = '' then do
         TempDir = translate(value('TMP',,'OS2ENVIRONMENT'),'\','/')
-        IF options.!debug == 1 THEN say '  TMP="'TempDir'"'
+        IF options.!debug == 1 THEN say '  TMP = "'TempDir'"'
     end
     if TempDir = '' then do

trunk/guitools/shared/nlv.vrs

@@ -31 +31 @@
         when settings.!nlv8dot3 = 0 then filestem = filestem||'_'
         when translate(filestem) = "EVFSGUI" then filestem = "evfsi_"
-        otherwise filestem = SUBSTR( filestem, 1, 5 )||'_' 
+        otherwise filestem = strip(SUBSTR( filestem, 1, 5 ))||'_' 
     end
     say '  NLV filestem   = "'filestem'"'
@@ -60 +60 @@
     Suffix  = arg(3)
     PathVar = arg(4)
-    say time()" NLVSearch() started"
     NLVSrchDone = 0
     NLVFile = ""
@@ -67 +66 @@
         say '  NLV 'Suffix' file   = "'filestem||nlv'.'Suffix'"'
         select
+            when VRFileExists(execdir'\'filestem||nlv'.'Suffix) then do
+                say "  Attempt1: NLV "Suffix" file found directly!"
+                NLVFile = strip(execdir'\'filestem||nlv'.'Suffix,'L','\')
+                NLVSrchDone = 1
+            end
             when VRFileExists(srchRoot'\'SubDir'\'filestem||nlv'.'Suffix) then do
-                say "  NLV "Suffix" file found directly!"
+                say "  Attempt2: NLV "Suffix" file found directly!"
                 NLVFile = strip(srchRoot'\'SubDir'\'filestem||nlv'.'Suffix,'L','\')
+                NLVSrchDone = 1
+            end
+            when SysSearchPath(PathVar, filestem||nlv'.'Suffix) \= '' then do
+                execDir = VRParseFileName(SysSearchPath(PathVar, filestem||nlv'.'Suffix),"DP")
+                say "  Attempt3: NLV "Suffix" file found via "PathVar
+                NLVFile = strip(execdir'\'filestem||nlv'.'Suffix,'L','\')
                 NLVSrchDone = 1
             end
@@ -75 +85 @@
                 ok = SysFileTree(UnixRoot||'\usr\share\os2\'filestem||nlv'.'Suffix,nlvmsg.,'FOS')
                 if nlvmsg.0 = 1 then do
-                    say "  Found  NLV "Suffix" file in rpm/yum subdirectory"
+                    say "  Attempt4: Found  NLV "Suffix" file in rpm/yum subdirectory"
                     NLVFile = VRParseFilename(nlvmsg.1,"DPN")'.'Suffix
                     say "  Adding NLV "Suffix" path to "PathVar
@@ -82 +92 @@
                     NLVSrchDone = 1
                 end
-                else say "  NLV "Suffix" file NOT in rpm/yum subdirectory."
+                else say "  NLV "Suffix" file NOT in rpm/yum "UnixRoot||'\usr\share\os2\'filestem||nlv'.'Suffix"subdirectory."
             end
-            when SysSearchPath(PathVar, filestem||nlv'.'Suffix) \= '' then do
-                execDir = VRParseFileName(SysSearchPath(PathVar, filestem||nlv'.'Suffix),"DP")
-                say "  NLV "Suffix" file found via "PathVar
-                NLVFile = strip(execdir'\'filestem||nlv'.'Suffix,'L','\')
-                NLVSrchDone = 1
-            end
+           
             otherwise do
                 say "  Searching subdirectories"

trunk/guitools/shared/sambainit.vrs

@@ -207 +207 @@
     if \VRFileExists(samba.!smbconf) then call _ErrorDataFileNotFound samba.!smbconf' is not present.'
     IF options.!debug == 1 then say '  Samba smb.conf = "'samba.!smbconf'"'
+
+    /* complete shadow copy of smb.conf in temporary directory - should always be created on the fly */
+    /* before reading from it */
+    samba.!shadowsmbconf = TempDir||'smb.conf'
 
     /* find all datafiles - their locations are fixed */

trunk/guitools/shared/smbtree.vrs

@@ -5 +5 @@
     say time()' _RefreshTree() started'
     FirstRun = 0
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", "Refreshing network")
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", " Refreshing network")
     ok = SysFileDelete(samba.!msg)
     parse var debuglevel .'='level
@@ -54 +54 @@
     if errstat = "READY:" then do
         if file2stem(samba.!error,"treeError.") > 1 then do
-            ok = VRSet("DT_STATUSBAR","Caption", treeError.2)
+            ok = VRSet("DT_STATUSBAR","Caption", " "||treeError.2)
         end
     end
@@ -458 +458 @@
     if UserCred = '-N' then UserCred = ''
 
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", "Ready.")
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", " Ready.")
     say time()' _AddSharesDisplay() loop end'
 return
@@ -501 +501 @@
     address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -D 'UserCred' 'debuglevel' >'samba.!msg
 
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption","Enumerating workgroups")
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption"," Enumerating workgroups")
     do while stream(samba.!msg,'c','open read') <> "READY:"
         ok = SysSleep(1)
@@ -563 +563 @@
     address cmd 'detach 'samba.!nmblookupexe' 'machine' 'debuglevel' >'samba.!msg
 
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption","Obtaining IP from "machine)
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption"," Obtaining IP from "machine)
     do while stream(samba.!msg,'c','open read') <> "READY:"
         ok = SysSleep(0.33)
@@ -590 +590 @@
     address cmd 'detach 'samba.!nmblookupexe' -A 'machine' 'debuglevel' >'samba.!msg
 
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption","Obtaining capabilities from "machine)
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption"," Obtaining capabilities from "machine)
     do while stream(samba.!msg,'c','open read') <> "READY:"
         ok = SysSleep(0.33)
@@ -625 +625 @@
     address cmd 'detach 'samba.!nmblookupexe' -S 'machine' 'debuglevel' >'samba.!msg
 
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption","Querying "machine" for roles")
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption"," Querying "machine" for roles")
     do while stream(samba.!msg,'c','open read') <> "READY:"
         ok = SysSleep(0.33)
@@ -665 +665 @@
 file2stem:
     say time()' file2stem() started'
-    msgfile = arg(1)
-    msgstem = arg(2)
-    delmsgfile = translate(arg(3))
+    msgfile = arg(1) /* file to create stem of */
+    msgstem = arg(2) /* name of the stem */
     if right(msgstem,1) <> '.' then msgstem = msgstem'.'
+    delmsgfile = translate(arg(3)) /* erase file after transfer */
+    skipwords = strip(arg(4)||' creating lame tdb( ***') /* skip lines with these words */
+    do J = 1 to words(skipwords)
+        skip.J = translate(word(skipWords,J))
+    end
+    skip.0 = J
+   
     say '  file2stem("'msgfile'","'msgstem'")'
     dyn = 'drop 'msgstem
     interpret dyn
     stemcount = 0
+    skipped = 0
     do while lines(msgfile) > 0
         stemcount = stemcount + 1
         inline = linein(msgfile)
-        if pos('creating lame',inline) > 0 | pos('tdb(',inline) > 0 then do
-            stemcount = stemcount - 1
-            iterate
-        end
-        dyn = msgstem||stemcount' = inline'
-        interpret dyn
+        SkipIt = 0
+        do J = 1 to skip.0
+        if pos(skip.J,translate(inline)) > 0 then do
+                skipit = 1
+                stemcount = stemcount - 1
+                skipped = skipped + 1
+                leave
+            end
+        end
+        if \SkipIt then do
+            dyn = msgstem||stemcount' = inline'
+            interpret dyn
+        end
     end
     dyn = msgstem||"0 = "stemcount
@@ -689 +703 @@
     
     drop msgfile msgstem
-    say time()' file2stem() ['stemcount'] done'    
+    say time()' file2stem() ['stemcount' added, 'skipped' skipped] done'    
 return stemcount