Changeset 786 for trunk


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/guitools/evfsgui/evfsgui.vrp

    r784 r786  
    88RunParameters:
    99RunDirectory: U:\Develop\Samba\trunk\guitools\evfsgui
    10 VRXWindow: __VREMainWindow,1,1951,2361,1012,7841
    11 VRXWindow: __VREFileListWindow,1,2192,7950,2665,3358
    12 VRXWindow: __VRESectionListWindow,1,1156,12382,12238,6914
    13 VRXWindow: __VREToolsWindow,0,3096,8528,5474,1669
    14 VRXWindow: __VREWindListWindow,1,723,8239,4963,3150
     10VRXWindow: __VREMainWindow,1,1963,2361,1012,7841
     11VRXWindow: __VREFileListWindow,1,2204,7950,2665,3358
     12VRXWindow: __VRESectionListWindow,1,1168,12382,12238,6914
     13VRXWindow: __VREToolsWindow,0,3108,8528,5474,1669
     14VRXWindow: __VREWindListWindow,1,952,11611,4963,3150
    1515UserFile: 1
    1616UserWindow: Main,1
     17UserWindow: SW_SETTINGS,1
    1718UserWindow: SW_SMBTREE,1
    1819UserWindow: SW_DIALOG,1

  • trunk/guitools/evfsgui/evfsgui.vrx

    r784 r786  
    215215/*:VRX         _BrowseBuildPath
    216216*/
    217 _BrowseBuildPath: procedure expose options. icons. sharerh
     217_BrowseBuildPath: procedure expose options. icons. samba. sharerh
    218218    if options.!debug == 1 then say time()' _BrowseBuildPath started'
    219219    rh = arg(1)
    … …  
    343343/*:VRX         _BrowseObjectOpen
    344344*/
    345 _BrowseObjectOpen: procedure expose options. cd. icons.
     345_BrowseObjectOpen: procedure expose samba. options. cd. icons.
    346346    machine    = arg(1)
    347347    sharename  = arg(2)
    … …  
    529529/*:VRX         _DelSMBObjectShares
    530530*/
    531 _DelSMBObjectShares: procedure expose options. SMBObj. rh
     531_DelSMBObjectShares: procedure expose samba. options. SMBObj. rh
    532532    /* Purpose: Delete shares for a given Object (as handle) */
    533533
    … …  
    603603/*:VRX         _GetSMBObjectProperties
    604604*/
    605 _GetSMBObjectProperties: procedure expose options. SMBObj. rh icon resname udatatype udatamsg parentrh icons.
     605_GetSMBObjectProperties: procedure expose samba. options. SMBObj. rh icon resname udatatype udatamsg parentrh icons.
    606606    if options.!debug == 1 then say time()' _GetSMBObjectProperties started'
    607607
    … …  
    663663/*:VRX         _GetSMBObjectShares
    664664*/
    665 _GetSMBObjectShares: procedure expose options. SMBObj. rh
     665_GetSMBObjectShares: procedure expose samba. options. SMBObj. rh
    666666    /* Purpose: Return stem with shares for a given Object (as handle) */
    667667
    … …  
    20842084            when SMBObj.udatatype = "SERVER" then do
    20852085                say "Server dragged!"
    2086                 p_workgroup = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.parentrh, "Caption")
     2086                if SMBObj.parentrh <> "" then do /* detect server without workgroup */
     2087                    p_workgroup = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.parentrh, "Caption")
     2088                end
    20872089                p_server    = SMBObj.resname
    20882090                p_share     = ""
    … …  
    20922094            when SMBObj.udatatype = "DISK" then do
    20932095                say "Shared disk dragged!"
    2094                 p_workgroup = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.gparentrh, "Caption")
     2096                if SMBObj.gparentrh <> "" then do /* detect share on a server without workgroup */
     2097                    p_workgroup = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.gparentrh, "Caption")
     2098                end
    20952099                p_server    = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.parentrh,  "Caption")
    20962100                parse var p_server p_server '0D0A'x .
    … …  
    26382642*/
    26392643Main_Create:
    2640     options.!debug    = 0
     2644    options.!debug    = 1
    26412645    if options.!debug == 1 then do
    26422646        ok = VRRedirectStdIO("ON")
    … …  
    26612665
    26622666    CALL _INILoad
     2667
     2668    call _TabFix 1
     2669    call SW_ADVANCED_Init_Content
     2670    call SW_SMBTREE_Init_Content
     2671    call SW_CONDET_Init_Content
     2672    call SW_SETTINGS_Init_Content
    26632673
    26642674    CALL Refresh
    … …  
    45204530SW_ABOUT_Init:
    45214531    window = VRInfo( "Object" )
    4522     if( \VRIsChildOf( window, "Notebook" ) ) then do
     4532    if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
    45234533        call VRMethod window, "CenterWindow"
    45244534        call VRSet window, "Visible", 1
    … …  
    47414751SW_INFO_Init:
    47424752    window = VRInfo( "Object" )
    4743     if( \VRIsChildOf( window, "Notebook" ) ) then do
     4753    if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
    47444754        call VRMethod window, "CenterWindow"
    47454755        call VRSet window, "Visible", 1
    … …  
    47974807SW_LOGIN_Init:
    47984808    window = VRInfo( "Object" )
    4799     if( \VRIsChildOf( window, "Notebook" ) ) then do
     4809    if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
    48004810        call VRMethod window, "CenterWindow"
    48014811        call VRSet window, "Visible", 1
    … …  
    48664876SW_MOUNTPOINT_Init:
    48674877    window = VRInfo( "Object" )
    4868     if( \VRIsChildOf( window, "Notebook" ) ) then do
     4878    if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
    48694879        call VRMethod window, "CenterWindow"
    48704880        call VRSet window, "Visible", 1
    … …  
    49204930SW_PORTCONNECT_Init:
    49214931    window = VRInfo( "Object" )
    4922     if( \VRIsChildOf( window, "Notebook" ) ) then do
     4932    if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
    49234933        call VRMethod window, "CenterWindow"
    49244934        call VRSet window, "Visible", 1
    … …  
    51195129    end
    51205130return
    5121 
    51225131/*:VRX         TM_AutoClose_Trigger
    51235132*/

  • trunk/guitools/shared/rxrpclib.vrs

    r703 r786  
    448448        rpcline = linein(rpcinfo.!msg)
    449449        if pos("creating default valid table",rpcline) <> 0 then iterate
     450        if pos("TDB(",translate(rpcline)) <> 0 then iterate
    450451
    451452        if pos("LOGON_FAILURE", rpcline) > 0 then do

  • trunk/guitools/shared/smbtree.vrs

    r785 r786  
    8383                comment = strip(comment)
    8484                if VRGet("CN_smbtree","View") = "IconTree" then parent = smbtree.!workgroup; else parent = ""
    85                 /* We make any machine as sleeping initially */
     85                /* We create any machine as sleeping initially */
    8686                smbtree.!machine = _AddSleepingMachine(machine,comment,parent)
    8787
    … …  
    117117            end
    118118            when smbtreeline.sl = "" then nop /* skip empty lines */
    119             otherwise do /* possibly a new workgroup */
     119            otherwise do /* possible new workgroup */
    120120                say '  Possible workgroup: "'smbtreeline.sl'"'
    121                 /* check for eventual error messages */
    122                 if pos("RECEIVING",translate(smbtreeline.sl)) > 0 | pos("NT_STATUS",translate(smbtreeline.sl)) > 0 then do
     121                ThrowMsg = 0
     122                /* Do some checks to be sure */
     123                select
     124                    when pos("RECEIVING",translate(smbtreeline.sl)) > 0 then ThrowMsg = 1
     125                    when pos("NT_STATUS",translate(smbtreeline.sl)) > 0 then ThrowMsg = 1
     126                    when pos(" ", smbtreeline.sl) > 0 then ThrowMsg = 1
     127                    when pos("=", smbtreeline.sl) > 0 then ThrowMsg = 1
     128                    when pos(":", smbtreeline.sl) > 0 then ThrowMsg = 1
     129                    when pos("%", smbtreeline.sl) > 0 then ThrowMsg = 1
     130                    otherwise do /* it is really a new workgroup */
     131                        if VRGet("CN_smbtree","View") = "IconTree" then do
     132                            say "Checks passed, "smbtreeline.sl" is a workgroup!"
     133                            smbtree.!workgroup = _AddWorkGroup(smbtreeline.sl)
     134                            CurWG = smbtreeline.sl
     135                        end
     136                    end
     137                end
     138                if ThrowMsg = 1 then do
     139                    ThrowMsg = 0
    123140                    Msg.Type = "W"
    124141                    Msg.Text = smbtreeline.sl
    125142                    call _ShowMsg
    126                 end
    127                 else do /* it is really a new workgroup */
    128                     if VRGet("CN_smbtree","View") = "IconTree" then do
    129                         smbtree.!workgroup = _AddWorkGroup(smbtreeline.sl)
    130                     end
    131                     CurWG = smbtreeline.sl
    132143                end
    133144            end
    … …  
    265276                line = linein(smbmachine.I)
    266277            end
     278            /* Filter possible debug messages */
     279            do while(pos("TDB(",translate(line)) > 0) | (pos("%",line) > 0) | (pos("=",line) > 0)
     280                say '  Skip "'line'"'
     281                line = linein(smbmachine.I)
     282            end
    267283            say '  Message "'line'"'
     284           
    268285            ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'UserData', "SERVER|"||strip(line))
    269286
Note: See TracChangeset for help on using the changeset viewer.