Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove extra colon in namespace delimiter |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: | 01f9053e790b0961b29bfeef4181012516cbf85e305ec88469770574530ceb39 |
| User & Date: | andy 2018-07-24 02:47:58 |
Context
| 2018-09-03 17:26 | Changed WS:Utils package version to 2.6.1 check-in: 2a9f30c6aa user: oehhar tags: trunk | |
| 2018-07-24 04:47 | Preliminary hacks working towards custom SOAP headers. Ticket [7c2ae385da] Leaf check-in: ecbb5e058a user: andy tags: soap-header | |
| 2018-07-24 02:47 | Remove extra colon in namespace delimiter check-in: 01f9053e79 user: andy tags: trunk | |
| 2018-07-24 02:42 | Clean up end-of-line whitespace check-in: 178aaf8434 user: andy tags: trunk | |
Changes
Changes to ClientSide.tcl.
2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 .... 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 .... 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 .... 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 .... 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 .... 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 .... 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 .... 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 .... 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 .... 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 .... 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 .... 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 .... 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 .... 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 |
# Version Date Programmer Comments / Changes / Reasons
# ------- ---------- ---------- -------------------------------------------
# 1 08/06/2006 G.Lester Initial version
#
#
###########################################################################
proc ::WS::Client::parseTypes {wsdlNode serviceName serviceInfoVar} {
::log:::log debug "Entering [info level 0]"
upvar 1 $serviceInfoVar serviceInfo
set tnsCount [llength [dict keys [dict get $serviceInfo tnsList url]]]
set baseUrl [dict get $serviceInfo location]
foreach schemaNode [$wsdlNode selectNodes w:types/xs:schema] {
::log:::log debug "Parsing node $schemaNode"
::WS::Utils::parseScheme Client $baseUrl $schemaNode $serviceName serviceInfo tnsCount
}
::log:::log debug "Leaving [lindex [info level 0] 0]"
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
................................................................................
# 1 08/06/2006 G.Lester Initial version
# 2.4.2 2017-08-31 H.Oehlmann Also set serviceArr operation members
# inputsName and outputsName.
#
#
###########################################################################
proc ::WS::Client::parseBinding {wsdlNode serviceName bindingName serviceInfoVar} {
::log:::log debug "Entering [info level 0]"
upvar 1 $serviceInfoVar serviceInfo
variable options
set bindQuery [format {w:binding[attribute::name='%s']} $bindingName]
array set msgToOper {}
foreach binding [$wsdlNode selectNodes $bindQuery] {
array unset msgToOper *
set portName [lindex [split [$binding getAttribute type] {:}] end]
::log:::log debug "\t Processing binding '$bindingName' on port '$portName'"
set operList [$binding selectNodes w:operation]
set styleNode [$binding selectNodes d:binding]
if {![info exists style]} {
if {[catch {$styleNode getAttribute style} tmpStyle]} {
set styleNode [$binding selectNodes {w:operation[1]/d:operation}]
if {$styleNode eq {}} {
##
## This binding is for a SOAP level other than 1.1
##
::log:::log debug "Skiping non-SOAP 1.1 binding [$binding asXML]"
continue
}
set style [$styleNode getAttribute style]
#puts "Using style for first operation {$style}"
} else {
set style $tmpStyle
#puts "Using style for first binding {$style}"
}
if {!($style eq {document} || $style eq {rpc} )} {
::log:::log debug "Leaving [lindex [info level 0] 0] with error @1"
return \
-code error \
-errorcode [list WS CLIENT UNSSTY $style] \
"Unsupported calling style: '$style'"
}
if {![info exists use]} {
set use [[$binding selectNodes {w:operation[1]/w:input/d:body}] getAttribute use]
if {!($style eq {document} && $use eq {literal} ) &&
!($style eq {rpc} && $use eq {encoded} )} {
::log:::log debug "Leaving [lindex [info level 0] 0] with error @2"
return \
-code error \
-errorcode [list WS CLIENT UNSMODE $use] \
"Unsupported mode: $style/$use"
}
}
}
................................................................................
##
## Process each operation
##
foreach oper $operList {
set operName [$oper getAttribute name]
set baseName $operName
::log:::log debug "\t Processing operation '$operName'"
##
## Check for overloading
##
set inNode [$oper selectNodes w:input]
if {[llength $inNode] == 1 && [$inNode hasAttribute name]} {
set inName [$inNode getAttribute name]
................................................................................
set typeNameList [getTypesForPort $wsdlNode $serviceName $baseName $portName $inName serviceInfo $style]
dict set serviceInfo operation $operName isClone 0
}
#puts "Processing operation $operName"
set actionNode [$oper selectNodes d:operation]
if {$actionNode eq {}} {
::log:::log debug "Skiping operation with no action [$oper asXML]"
continue
}
dict lappend serviceInfo operList $operName
dict set serviceInfo operation $operName cloneList {}
dict set serviceInfo operation $operName cloned 0
dict set serviceInfo operation $operName name $baseName
dict set serviceInfo operation $operName style $style
................................................................................
## Get the input headers, if any
##
set soapRequestHeaderList {{}}
foreach inHeader [$oper selectNodes w:input/d:header] {
##set part [$inHeader getAttribute part]
set tmp [$inHeader getAttribute use]
if {$tmp ne $use} {
::log:::log debug "Leaving [lindex [info level 0] 0] with error @3"
return \
-code error \
-errorcode [list WS CLIENT MIXUSE $use $tmp] \
"Mixed usageage not supported!'"
}
set msgName [$inHeader getAttribute message]
::log:::log debug [list messageToType $wsdlNode $serviceName $baseName $msgName serviceInfo $style]
set type [messageToType $wsdlNode $serviceName $baseName $msgName serviceInfo $style]
lappend soapRequestHeaderList $type
}
dict set serviceInfo operation $operName soapRequestHeader $soapRequestHeaderList
if {![dict exists [dict get $serviceInfo operation $operName] action]} {
dict set serviceInfo operation $operName action $serviceName
}
................................................................................
## Get the output header, if one
##
set soapReplyHeaderList {{}}
foreach outHeader [$oper selectNodes w:output/d:header] {
##set part [$outHeader getAttribute part]
set tmp [$outHeader getAttribute use]
if {$tmp ne $use} {
::log:::log debug "Leaving [lindex [info level 0] 0] with error @4"
return \
-code error \
-errorcode [list WS CLIENT MIXUSE $use $tmp] \
"Mixed usageage not supported!'"
}
set messagePath [$outHeader getAttribute message]
set msgName [lindex [split $messagePath {:}] end]
::log:::log debug [list messageToType $wsdlNode $serviceName $baseName $msgName serviceInfo $style]
set type [messageToType $wsdlNode $serviceName $baseName $msgName serviceInfo $style]
lappend soapReplyHeaderList $type
}
dict set serviceInfo operation $operName soapReplyHeader $soapReplyHeaderList
##
## Validate that the input and output uses are the same
................................................................................
##
set inUse $use
set outUse $use
catch {set inUse [[$oper selectNodes w:input/d:body] getAttribute use]}
catch {set outUse [[$oper selectNodes w:output/d:body] getAttribute use]}
foreach tmp [list $inUse $outUse] {
if {$tmp ne $use} {
::log:::log debug "Leaving [lindex [info level 0] 0] with error @5"
return \
-code error \
-errorcode [list WS CLIENT MIXUSE $use $tmp] \
"Mixed usageage not supported!'"
}
}
::log:::log debug "\t Input/Output types and names are {$typeNameList}"
foreach {type name} $typeNameList mode {inputs outputs} {
dict set serviceInfo operation $operName $mode $type
# also set outputsname which is used to match it as alternate response node name
dict set serviceInfo operation $operName ${mode}name $name
}
set inMessage [dict get $serviceInfo operation $operName inputs]
if {[dict exists $serviceInfo inputMessages $inMessage] } {
................................................................................
}
}
set xns tns1
dict set serviceInfo operation $operName xns $xns
}
}
::log:::log debug "Leaving [lindex [info level 0] 0]"
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
................................................................................
# 2.4.3 2017-11-03 H.Oehlmann If name is not given, set the default
# name of <OP>Request/Response given by the
# WSDL 1.0 standard.
#
#
###########################################################################
proc ::WS::Client::getTypesForPort {wsdlNode serviceName operName portName inName serviceInfoVar style} {
::log:::log debug "Entering [info level 0]"
upvar 1 $serviceInfoVar serviceInfo
set inType {}
set outType {}
#set portQuery [format {w:portType[attribute::name='%s']} $portName]
#set portNode [lindex [$wsdlNode selectNodes $portQuery] 0]
................................................................................
if {$inName eq {}} {
set operQuery [format {w:portType[attribute::name='%s']/w:operation[attribute::name='%s']} \
$portName $operName]
} else {
set operQuery [format {w:portType[attribute::name='%s']/w:operation[attribute::name='%s']/w:input[attribute::name='%s']/parent::*} \
$portName $operName $inName]
}
::log:::log debug "\t operNode query is {$operQuery}"
set operNode [$wsdlNode selectNodes $operQuery]
if {$operNode eq {} && $inName ne {}} {
set operQuery [format {w:portType[attribute::name='%s']/w:operation[attribute::name='%s']} \
$portName $operName]
::log:::log debug "\t operNode query is {$operQuery}"
set operNode [$wsdlNode selectNodes $operQuery]
}
set resList {}
foreach sel {w:input w:output} defaultNameSuffix {Request Response} {
set nodeList [$operNode selectNodes $sel]
if {1 == [llength $nodeList]} {
................................................................................
}
}
}
##
## Return the types
##
::log:::log debug "Leaving [lindex [info level 0] 0] with $resList"
return $resList
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
................................................................................
# ------- ---------- ---------- -------------------------------------------
# 1 08/06/2006 G.Lester Initial version
#
#
###########################################################################
proc ::WS::Client::messageToType {wsdlNode serviceName operName msgName serviceInfoVar style} {
upvar 1 $serviceInfoVar serviceInfo
::log:::log debug "Entering [info level 0]"
#puts "Message to Type $serviceName $operName $msgName"
set msgQuery [format {w:message[attribute::name='%s']} $msgName]
set msg [$wsdlNode selectNodes $msgQuery]
if {$msg eq {} &&
[llength [set msgNameList [split $msgName {:}]]] > 1} {
................................................................................
-errorcode [list WS CLIENT BADMSGSEC $msgName] \
"Can not find message '$msgName'"
}
switch -exact -- $style {
document/literal {
set partNode [$msg selectNodes w:part]
set partNodeCount [llength $partNode]
::log:::log debug "partNodeCount = {$partNodeCount}"
if {$partNodeCount == 1} {
if {[$partNode hasAttribute element]} {
set type [::WS::Utils::getQualifiedType $serviceInfo [$partNode getAttribute element] tns1]
}
}
if {($partNodeCount > 1) || ![info exist type]} {
set tmpType {}
................................................................................
"Unknown style combination $style"
}
}
##
## Return the type name
##
::log:::log debug "Leaving [lindex [info level 0] 0] with {$type}"
return $type
}
#---------------------------------------
#---------------------------------------
###########################################################################
|
| | | | | | | | | | | | | | | | | | | | | | | | |
2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 .... 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 .... 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 .... 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 .... 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 .... 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 .... 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 .... 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 .... 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 .... 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 .... 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 .... 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 .... 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 .... 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 |
# Version Date Programmer Comments / Changes / Reasons
# ------- ---------- ---------- -------------------------------------------
# 1 08/06/2006 G.Lester Initial version
#
#
###########################################################################
proc ::WS::Client::parseTypes {wsdlNode serviceName serviceInfoVar} {
::log::log debug "Entering [info level 0]"
upvar 1 $serviceInfoVar serviceInfo
set tnsCount [llength [dict keys [dict get $serviceInfo tnsList url]]]
set baseUrl [dict get $serviceInfo location]
foreach schemaNode [$wsdlNode selectNodes w:types/xs:schema] {
::log::log debug "Parsing node $schemaNode"
::WS::Utils::parseScheme Client $baseUrl $schemaNode $serviceName serviceInfo tnsCount
}
::log::log debug "Leaving [lindex [info level 0] 0]"
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
................................................................................
# 1 08/06/2006 G.Lester Initial version
# 2.4.2 2017-08-31 H.Oehlmann Also set serviceArr operation members
# inputsName and outputsName.
#
#
###########################################################################
proc ::WS::Client::parseBinding {wsdlNode serviceName bindingName serviceInfoVar} {
::log::log debug "Entering [info level 0]"
upvar 1 $serviceInfoVar serviceInfo
variable options
set bindQuery [format {w:binding[attribute::name='%s']} $bindingName]
array set msgToOper {}
foreach binding [$wsdlNode selectNodes $bindQuery] {
array unset msgToOper *
set portName [lindex [split [$binding getAttribute type] {:}] end]
::log::log debug "\t Processing binding '$bindingName' on port '$portName'"
set operList [$binding selectNodes w:operation]
set styleNode [$binding selectNodes d:binding]
if {![info exists style]} {
if {[catch {$styleNode getAttribute style} tmpStyle]} {
set styleNode [$binding selectNodes {w:operation[1]/d:operation}]
if {$styleNode eq {}} {
##
## This binding is for a SOAP level other than 1.1
##
::log::log debug "Skiping non-SOAP 1.1 binding [$binding asXML]"
continue
}
set style [$styleNode getAttribute style]
#puts "Using style for first operation {$style}"
} else {
set style $tmpStyle
#puts "Using style for first binding {$style}"
}
if {!($style eq {document} || $style eq {rpc} )} {
::log::log debug "Leaving [lindex [info level 0] 0] with error @1"
return \
-code error \
-errorcode [list WS CLIENT UNSSTY $style] \
"Unsupported calling style: '$style'"
}
if {![info exists use]} {
set use [[$binding selectNodes {w:operation[1]/w:input/d:body}] getAttribute use]
if {!($style eq {document} && $use eq {literal} ) &&
!($style eq {rpc} && $use eq {encoded} )} {
::log::log debug "Leaving [lindex [info level 0] 0] with error @2"
return \
-code error \
-errorcode [list WS CLIENT UNSMODE $use] \
"Unsupported mode: $style/$use"
}
}
}
................................................................................
##
## Process each operation
##
foreach oper $operList {
set operName [$oper getAttribute name]
set baseName $operName
::log::log debug "\t Processing operation '$operName'"
##
## Check for overloading
##
set inNode [$oper selectNodes w:input]
if {[llength $inNode] == 1 && [$inNode hasAttribute name]} {
set inName [$inNode getAttribute name]
................................................................................
set typeNameList [getTypesForPort $wsdlNode $serviceName $baseName $portName $inName serviceInfo $style]
dict set serviceInfo operation $operName isClone 0
}
#puts "Processing operation $operName"
set actionNode [$oper selectNodes d:operation]
if {$actionNode eq {}} {
::log::log debug "Skiping operation with no action [$oper asXML]"
continue
}
dict lappend serviceInfo operList $operName
dict set serviceInfo operation $operName cloneList {}
dict set serviceInfo operation $operName cloned 0
dict set serviceInfo operation $operName name $baseName
dict set serviceInfo operation $operName style $style
................................................................................
## Get the input headers, if any
##
set soapRequestHeaderList {{}}
foreach inHeader [$oper selectNodes w:input/d:header] {
##set part [$inHeader getAttribute part]
set tmp [$inHeader getAttribute use]
if {$tmp ne $use} {
::log::log debug "Leaving [lindex [info level 0] 0] with error @3"
return \
-code error \
-errorcode [list WS CLIENT MIXUSE $use $tmp] \
"Mixed usageage not supported!'"
}
set msgName [$inHeader getAttribute message]
::log::log debug [list messageToType $wsdlNode $serviceName $baseName $msgName serviceInfo $style]
set type [messageToType $wsdlNode $serviceName $baseName $msgName serviceInfo $style]
lappend soapRequestHeaderList $type
}
dict set serviceInfo operation $operName soapRequestHeader $soapRequestHeaderList
if {![dict exists [dict get $serviceInfo operation $operName] action]} {
dict set serviceInfo operation $operName action $serviceName
}
................................................................................
## Get the output header, if one
##
set soapReplyHeaderList {{}}
foreach outHeader [$oper selectNodes w:output/d:header] {
##set part [$outHeader getAttribute part]
set tmp [$outHeader getAttribute use]
if {$tmp ne $use} {
::log::log debug "Leaving [lindex [info level 0] 0] with error @4"
return \
-code error \
-errorcode [list WS CLIENT MIXUSE $use $tmp] \
"Mixed usageage not supported!'"
}
set messagePath [$outHeader getAttribute message]
set msgName [lindex [split $messagePath {:}] end]
::log::log debug [list messageToType $wsdlNode $serviceName $baseName $msgName serviceInfo $style]
set type [messageToType $wsdlNode $serviceName $baseName $msgName serviceInfo $style]
lappend soapReplyHeaderList $type
}
dict set serviceInfo operation $operName soapReplyHeader $soapReplyHeaderList
##
## Validate that the input and output uses are the same
................................................................................
##
set inUse $use
set outUse $use
catch {set inUse [[$oper selectNodes w:input/d:body] getAttribute use]}
catch {set outUse [[$oper selectNodes w:output/d:body] getAttribute use]}
foreach tmp [list $inUse $outUse] {
if {$tmp ne $use} {
::log::log debug "Leaving [lindex [info level 0] 0] with error @5"
return \
-code error \
-errorcode [list WS CLIENT MIXUSE $use $tmp] \
"Mixed usageage not supported!'"
}
}
::log::log debug "\t Input/Output types and names are {$typeNameList}"
foreach {type name} $typeNameList mode {inputs outputs} {
dict set serviceInfo operation $operName $mode $type
# also set outputsname which is used to match it as alternate response node name
dict set serviceInfo operation $operName ${mode}name $name
}
set inMessage [dict get $serviceInfo operation $operName inputs]
if {[dict exists $serviceInfo inputMessages $inMessage] } {
................................................................................
}
}
set xns tns1
dict set serviceInfo operation $operName xns $xns
}
}
::log::log debug "Leaving [lindex [info level 0] 0]"
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
................................................................................
# 2.4.3 2017-11-03 H.Oehlmann If name is not given, set the default
# name of <OP>Request/Response given by the
# WSDL 1.0 standard.
#
#
###########################################################################
proc ::WS::Client::getTypesForPort {wsdlNode serviceName operName portName inName serviceInfoVar style} {
::log::log debug "Entering [info level 0]"
upvar 1 $serviceInfoVar serviceInfo
set inType {}
set outType {}
#set portQuery [format {w:portType[attribute::name='%s']} $portName]
#set portNode [lindex [$wsdlNode selectNodes $portQuery] 0]
................................................................................
if {$inName eq {}} {
set operQuery [format {w:portType[attribute::name='%s']/w:operation[attribute::name='%s']} \
$portName $operName]
} else {
set operQuery [format {w:portType[attribute::name='%s']/w:operation[attribute::name='%s']/w:input[attribute::name='%s']/parent::*} \
$portName $operName $inName]
}
::log::log debug "\t operNode query is {$operQuery}"
set operNode [$wsdlNode selectNodes $operQuery]
if {$operNode eq {} && $inName ne {}} {
set operQuery [format {w:portType[attribute::name='%s']/w:operation[attribute::name='%s']} \
$portName $operName]
::log::log debug "\t operNode query is {$operQuery}"
set operNode [$wsdlNode selectNodes $operQuery]
}
set resList {}
foreach sel {w:input w:output} defaultNameSuffix {Request Response} {
set nodeList [$operNode selectNodes $sel]
if {1 == [llength $nodeList]} {
................................................................................
}
}
}
##
## Return the types
##
::log::log debug "Leaving [lindex [info level 0] 0] with $resList"
return $resList
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
................................................................................
# ------- ---------- ---------- -------------------------------------------
# 1 08/06/2006 G.Lester Initial version
#
#
###########################################################################
proc ::WS::Client::messageToType {wsdlNode serviceName operName msgName serviceInfoVar style} {
upvar 1 $serviceInfoVar serviceInfo
::log::log debug "Entering [info level 0]"
#puts "Message to Type $serviceName $operName $msgName"
set msgQuery [format {w:message[attribute::name='%s']} $msgName]
set msg [$wsdlNode selectNodes $msgQuery]
if {$msg eq {} &&
[llength [set msgNameList [split $msgName {:}]]] > 1} {
................................................................................
-errorcode [list WS CLIENT BADMSGSEC $msgName] \
"Can not find message '$msgName'"
}
switch -exact -- $style {
document/literal {
set partNode [$msg selectNodes w:part]
set partNodeCount [llength $partNode]
::log::log debug "partNodeCount = {$partNodeCount}"
if {$partNodeCount == 1} {
if {[$partNode hasAttribute element]} {
set type [::WS::Utils::getQualifiedType $serviceInfo [$partNode getAttribute element] tns1]
}
}
if {($partNodeCount > 1) || ![info exist type]} {
set tmpType {}
................................................................................
"Unknown style combination $style"
}
}
##
## Return the type name
##
::log::log debug "Leaving [lindex [info level 0] 0] with {$type}"
return $type
}
#---------------------------------------
#---------------------------------------
###########################################################################
|
Changes to Utilities.tcl.
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
....
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
|
set nodeFound 1
set partList [concat $partList $tmp]
} elseif {[llength $tmp]} {
##
## Found extension, but it is an empty type
##
} else {
::log:::log debug "Unknown extension!"
return
}
}
default {
##
## Placed here to shut up tclchecker
##
................................................................................
}
}
}
::log::logsubst debug {at end of foreach {$typeName} with {$partList}}
if {[llength $partList] || $isAbstractType} {
#dict set results types $tns:$typeName $partList
dict set results types $typeName $partList
::log:::logsubst debug {Defining $typeName as '$partList'}
##
## Add complex type definition, if:
## * there is a part list
## * or it is an abstract type announced as complex
## (see xml snipped above about [Bug 584bfb77])
## -> will set dict typeInfo client $service tns1:envelope {
## definition {} xns tns1 abstract true}
|
|
|
|
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
....
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
|
set nodeFound 1
set partList [concat $partList $tmp]
} elseif {[llength $tmp]} {
##
## Found extension, but it is an empty type
##
} else {
::log::log debug "Unknown extension!"
return
}
}
default {
##
## Placed here to shut up tclchecker
##
................................................................................
}
}
}
::log::logsubst debug {at end of foreach {$typeName} with {$partList}}
if {[llength $partList] || $isAbstractType} {
#dict set results types $tns:$typeName $partList
dict set results types $typeName $partList
::log::logsubst debug {Defining $typeName as '$partList'}
##
## Add complex type definition, if:
## * there is a part list
## * or it is an abstract type announced as complex
## (see xml snipped above about [Bug 584bfb77])
## -> will set dict typeInfo client $service tns1:envelope {
## definition {} xns tns1 abstract true}
|