Check-in [07f65e990e]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Replaced stderr error print by error log (::WS::Utils::ProcessImportXml). Plus some documentation and ticket numbers.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 07f65e990efc339bd5d49939698c5526ea8e3a5710992b93461af74b2fec606b
User & Date: oehhar 2018-09-03 17:55:32.466
Context
2018-12-06 12:17
(WSDL)Support type with namespace definition in tag. Ticket [6fbee3208e] check-in: a1cf727fd3 user: oehhar tags: trunk
2018-11-05 08:48
Patch to support ns prefix defined in the element. Ticket [6fbee3208e] check-in: 62c4dae5f1 user: oehhar tags: ticket-6fbee320-local-ns-prefix
2018-09-03 17:55
Replaced stderr error print by error log (::WS::Utils::ProcessImportXml). Plus some documentation and ticket numbers. check-in: 07f65e990e user: oehhar tags: trunk
2018-09-03 17:26
Changed WS:Utils package version to 2.6.1 check-in: 2a9f30c6aa user: oehhar tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Utilities.tcl.
750
751
752
753
754
755
756
757

758
759

760
761
762
763
764
765
766
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  08/06/2006  G.Lester     Initial version
#   2.6.1  07/20/2018  A.Goth       Correct variable access problems.

#                                   Bug introduced 2015-05-24 Checkin [9c7e118edb]
#

#
###########################################################################
proc ::WS::Utils::ProcessImportXml {mode baseUrl xml serviceName serviceInfoVar tnsCountVar} {
    ::log::logsubst debug {Entering [info level 0]}
    upvar 1 $serviceInfoVar serviceInfo
    upvar 1 $tnsCountVar tnsCount
    variable currentSchema







|
>
|
<
>







750
751
752
753
754
755
756
757
758
759

760
761
762
763
764
765
766
767
# Maintenance History - as this file is modified, please be sure that you
#                       update this segment of the file header block by
#                       adding a complete entry at the bottom of the list.
#
# Version     Date     Programmer   Comments / Changes / Reasons
# -------  ----------  ----------   -------------------------------------------
#       1  08/06/2006  G.Lester     Initial version
#   2.6.1  07/20/2018  A.Goth       Correct variable access problems. Ticket [7bb1cd7b43]
#                                   Corrected access of right document. Ticket [61fd346dc3]
#                                   Bugs introduced 2015-05-24 Checkin [9c7e118edb]

#          2018-09-03  H.Oehlmann   Replaced stderr error print by error log.
#
###########################################################################
proc ::WS::Utils::ProcessImportXml {mode baseUrl xml serviceName serviceInfoVar tnsCountVar} {
    ::log::logsubst debug {Entering [info level 0]}
    upvar 1 $serviceInfoVar serviceInfo
    upvar 1 $tnsCountVar tnsCount
    variable currentSchema
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
    $doc selectNodesNamespaces {
        w http://schemas.xmlsoap.org/wsdl/
        d http://schemas.xmlsoap.org/wsdl/soap/
        xs http://www.w3.org/2001/XMLSchema
    }
    $doc documentElement schema
    if {[catch {ProcessIncludes $schema $baseUrl} errMsg]} {
        puts stderr "Error processing include $schema $baseUrl"
        puts stderr $::errorInfo
        puts stderr $::errorCode
        puts stderr $errMsg
    }

    set prevSchema $currentSchema
    set nodeList [$doc selectNodes -namespaces $nsList descendant::xs:schema]
    foreach node $nodeList {
        set currentSchema $node
        parseScheme $mode $baseUrl $node $serviceName serviceInfo tnsCount







|
<
<
<







783
784
785
786
787
788
789
790



791
792
793
794
795
796
797
    $doc selectNodesNamespaces {
        w http://schemas.xmlsoap.org/wsdl/
        d http://schemas.xmlsoap.org/wsdl/soap/
        xs http://www.w3.org/2001/XMLSchema
    }
    $doc documentElement schema
    if {[catch {ProcessIncludes $schema $baseUrl} errMsg]} {
	::log::log error "Error processing include $schema $baseUrl: $errMsg"



    }

    set prevSchema $currentSchema
    set nodeList [$doc selectNodes -namespaces $nsList descendant::xs:schema]
    foreach node $nodeList {
        set currentSchema $node
        parseScheme $mode $baseUrl $node $serviceName serviceInfo tnsCount