Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | * add "flavor" support for "rest" or "soap" * add support for returning json serialized representation of documentation. * add support for optional structure members with "?" suffix char * add "enforceRequired" option to trigger error when a proc fails to return a requiredstructure member. * add "verifyUserArgs" option to validate proc arguments. * add "errorCallback" option to be invoked when serializing a error response. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | fwr-jsonrest-changes |
| Files: | files | file ages | folders |
| SHA1: |
5833e8d08911652532ec03c091ca6446 |
| User & Date: | jeff.lawson 2017-04-05 03:58:27.991 |
Context
| 2017-04-05 03:59 | change "string equal" to eq/ne check-in: a489b96328 user: jeff.lawson tags: fwr-jsonrest-changes | |
| 2017-04-05 03:58 | * add "flavor" support for "rest" or "soap" * add support for returning json serialized representation of documentation. * add support for optional structure members with "?" suffix char * add "enforceRequired" option to trigger error when a proc fails to return a requiredstructure member. * add "verifyUserArgs" option to validate proc arguments. * add "errorCallback" option to be invoked when serializing a error response. check-in: 5833e8d089 user: jeff.lawson tags: fwr-jsonrest-changes | |
| 2017-04-01 08:41 | Create new branch named "fwr-jsonrest-changes" check-in: 171251a55b user: jeff.lawson tags: rfe-9c6ff35e39, fwr-jsonrest-changes | |
Changes
Changes to AOLserver.tcl.
| ︙ | ︙ | |||
108 109 110 111 112 113 114 |
default {
ns_return 200 text/plain "prefix = $prefix service = $service requestType = $requestType"
}
}
}
}
| | | 108 109 110 111 112 113 114 115 |
default {
ns_return 200 text/plain "prefix = $prefix service = $service requestType = $requestType"
}
}
}
}
package provide WS::AOLserver 2.4.0
|
Changes to ChannelServer.tcl.
| ︙ | ︙ | |||
50 51 52 53 54 55 56 |
}
}
package require uri
package require base64
package require html
| | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 |
}
}
package require uri
package require base64
package require html
package provide WS::Channel 2.4.0
namespace eval ::WS::Channel {
array set portInfo {}
array set dataArray {}
}
|
| ︙ | ︙ |
Changes to ClientSide.tcl.
| ︙ | ︙ | |||
43 44 45 46 47 48 49 | package require Tcl 8.4 package require WS::Utils 2.3.7 ; # dict, lassign package require tdom 0.8 package require http 2 package require log package require uri | | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 |
package require Tcl 8.4
package require WS::Utils 2.3.7 ; # dict, lassign
package require tdom 0.8
package require http 2
package require log
package require uri
package provide WS::Client 2.4.0
namespace eval ::WS::Client {
# register https only if not yet registered
if {[catch { http::unregister https } lPortCmd]} {
# not registered -> register on my own
if {[catch {
package require tls
http::register https 443 [list ::tls::socket -ssl2 no -ssl3 no -tls1 yes]
} err]} {
log::log warning "No https support: $err"
|
| ︙ | ︙ | |||
840 841 842 843 844 845 846 |
set serviceArr($serviceName) $serviceInfo
if {[dict exists $serviceInfo types]} {
foreach {typeName partList} [dict get $serviceInfo types] {
set definition [dict get $partList definition]
set xns [dict get $partList xns]
set isAbstarct [dict get $partList abstract]
| | | | 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 |
set serviceArr($serviceName) $serviceInfo
if {[dict exists $serviceInfo types]} {
foreach {typeName partList} [dict get $serviceInfo types] {
set definition [dict get $partList definition]
set xns [dict get $partList xns]
set isAbstarct [dict get $partList abstract]
if {[lindex [split $typeName {:}] 1] eq {}} {
::WS::Utils::ServiceTypeDef Client $serviceName $typeName $definition tns1 $isAbstarct
} else {
#set typeName [lindex [split $typeName {:}] 1]
::WS::Utils::ServiceTypeDef Client $serviceName $typeName $definition $xns $isAbstarct
}
}
}
if {[dict exists $serviceInfo simpletypes]} {
foreach partList [dict get $serviceInfo simpletypes] {
lassign $partList typeName definition
if {[lindex [split $typeName {:}] 1] eq {}} {
::WS::Utils::ServiceSimpleTypeDef Client $serviceName $typeName $definition tns1
} else {
set xns [lindex [split $typeName {:}] 0]
#set typeName [lindex [split $typeName {:}] 1]
::WS::Utils::ServiceSimpleTypeDef Client $serviceName $typeName $definition $xns
}
}
|
| ︙ | ︙ | |||
2080 2081 2082 2083 2084 2085 2086 |
# ::WS::Utils::setAttr $node $outHeaderAttrs
#}
::log::log debug "Calling [list ::WS::Utils::convertTypeToDict Client $serviceName $node $outHeaderType $headerRootNode]"
lappend results [::WS::Utils::convertTypeToDict Client $serviceName $node $outHeaderType $headerRootNode]
}
}
::log::log debug "Calling [list ::WS::Utils::convertTypeToDict Client $serviceName $rootNode $expectedMsgType $body]"
| | | 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 |
# ::WS::Utils::setAttr $node $outHeaderAttrs
#}
::log::log debug "Calling [list ::WS::Utils::convertTypeToDict Client $serviceName $node $outHeaderType $headerRootNode]"
lappend results [::WS::Utils::convertTypeToDict Client $serviceName $node $outHeaderType $headerRootNode]
}
}
::log::log debug "Calling [list ::WS::Utils::convertTypeToDict Client $serviceName $rootNode $expectedMsgType $body]"
if {$rootName ne {}} {
set bodyData [::WS::Utils::convertTypeToDict \
Client $serviceName $rootNode $expectedMsgType $body]
if {![llength $bodyData] && ([dict get $serviceInfo skipLevelWhenActionPresent] || [dict get $serviceInfo skipLevelOnReply])} {
::log::log debug "Calling [list ::WS::Utils::convertTypeToDict Client $serviceName $rootNode $expectedMsgType $body] -- skipLevelWhenActionPresent was set"
set bodyData [::WS::Utils::convertTypeToDict \
Client $serviceName $body $expectedMsgType $body]
}
|
| ︙ | ︙ | |||
2892 2893 2894 2895 2896 2897 2898 |
}
set inMessage [dict get $serviceInfo operation $operName inputs]
if {[dict exists $serviceInfo inputMessages $inMessage] } {
set operList [dict get $serviceInfo inputMessages $inMessage]
} else {
set operList {}
}
| | | 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 |
}
set inMessage [dict get $serviceInfo operation $operName inputs]
if {[dict exists $serviceInfo inputMessages $inMessage] } {
set operList [dict get $serviceInfo inputMessages $inMessage]
} else {
set operList {}
}
lappend operList $operName
dict set serviceInfo inputMessages $inMessage $operList
##
## Handle target namespace defined at WSDL level for older RPC/Encoded
##
if {![dict exists $serviceInfo targetNamespace]} {
catch {
|
| ︙ | ︙ |
Changes to Embedded.tcl.
| ︙ | ︙ | |||
40 41 42 43 44 45 46 | } package require uri package require base64 package require html package require log | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 |
}
package require uri
package require base64
package require html
package require log
package provide WS::Embeded 2.4.0
namespace eval ::WS::Embeded {
array set portInfo {}
set portList [list]
set forever {}
|
| ︙ | ︙ |
Changes to ServerSide.tcl.
| ︙ | ︙ | |||
35 36 37 38 39 40 41 | ## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ## ## ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ## ## POSSIBILITY OF SUCH DAMAGE. ## ## ## ############################################################################### package require Tcl 8.4 | | | | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 |
## LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ##
## ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ##
## POSSIBILITY OF SUCH DAMAGE. ##
## ##
###############################################################################
package require Tcl 8.4
package require WS::Utils 2.4 ; # provides dict
package require html
package require log
package require tdom
package provide WS::Server 2.4.0
namespace eval ::WS::Server {
array set ::WS::Server::serviceArr {}
set ::WS::Server::procInfo {}
set ::WS::Server::mode {}
}
|
| ︙ | ︙ | |||
124 125 126 127 128 129 130 131 132 133 134 135 136 137 |
# -prefix - Path prefix used for the namespace and endpoint
# Defaults to "/service/" plus the service name
# -traceEnabled - Boolean to enable/disable trace being passed back in exception
# Defaults to "Y"
# -docFormat - Format of the documentation for operations ("text" or "html").
# Defaults to "text"
# -stylesheet - The CSS stylesheet URL used in the HTML documentation
#
#
# Returns : Nothing
#
# Side-Effects : None
#
# Exception Conditions :
| > > > > > > | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 |
# -prefix - Path prefix used for the namespace and endpoint
# Defaults to "/service/" plus the service name
# -traceEnabled - Boolean to enable/disable trace being passed back in exception
# Defaults to "Y"
# -docFormat - Format of the documentation for operations ("text" or "html").
# Defaults to "text"
# -stylesheet - The CSS stylesheet URL used in the HTML documentation
# -errorCallback - Callback to be invoked in the event of an error being produced
# -verifyUserArgs - Boolean to enable/disable validating user supplied arguments
# Defaults to "N"
# -enforceRequired - Throw an error if a required field is not included in the
# response.
# Defaults to "N"
#
#
# Returns : Nothing
#
# Side-Effects : None
#
# Exception Conditions :
|
| ︙ | ︙ | |||
171 172 173 174 175 176 177 178 179 180 181 182 183 184 |
-author {}
-description {}
-mode {tclhttpd}
-ports {80}
-traceEnabled {Y}
-docFormat {text}
-stylesheet {}
}
array set defaults $args
if {[string equal $defaults(-mode) channel]} {
set defaults(-ports) {stdin stdout}
array set defaults $args
}
set requiredList {-service}
| > > > > | 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 |
-author {}
-description {}
-mode {tclhttpd}
-ports {80}
-traceEnabled {Y}
-docFormat {text}
-stylesheet {}
-beautifyJson {N}
-errorCallback {}
-verifyUserArgs {N}
-enforceRequired {N}
}
array set defaults $args
if {[string equal $defaults(-mode) channel]} {
set defaults(-ports) {stdin stdout}
array set defaults $args
}
set requiredList {-service}
|
| ︙ | ︙ | |||
196 197 198 199 200 201 202 |
}
set service $defaults(-service)
if {![info exists defaults(-prefix)]} {
set defaults(-prefix) /service/$service
}
# find default host
if {![info exists defaults(-host)]} {
| | | | | | | | | | | | | 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 |
}
set service $defaults(-service)
if {![info exists defaults(-prefix)]} {
set defaults(-prefix) /service/$service
}
# find default host
if {![info exists defaults(-host)]} {
switch -exact -- $defaults(-mode) {
embedded {
set me [socket -server garbage_word -myaddr [info hostname] 0]
set defaults(-host) [lindex [fconfigure $me -sockname] 0]
close $me
if {0 !=[llength $defaults(-ports)] && 80 != [lindex $defaults(-ports) 0]} {
append defaults(-host) ":[lindex $defaults(-ports) 0]"
}
}
default {
set defaults(-host) localhost
}
}
}
set defaults(-uri) $service
namespace eval ::$service {}
set serviceArr($service) [array get defaults]
if {![dict exists $procInfo $service operationList]} {
dict set procInfo $service operationList {}
|
| ︙ | ︙ | |||
240 241 242 243 244 245 246 |
::Url_PrefixInstall $defaults(-prefix) ::WS::Server::generateInfo_${service} \
-thread 0
}
wub {
package require WS::Wub
}
aolserver {
| | | 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 |
::Url_PrefixInstall $defaults(-prefix) ::WS::Server::generateInfo_${service} \
-thread 0
}
wub {
package require WS::Wub
}
aolserver {
package require WS::AOLserver
}
rivet {
package require Rivet
}
wibble {
##
## Define zone handler - get code from andy
|
| ︙ | ︙ | |||
726 727 728 729 730 731 732 |
::WS::Channel::ReturnData \
$sock \
"text/xml; charset=UTF-8" \
"<html><head><title>Webservice Error</title></head><body><h2>$msg</h2></body></html>" \
404
}
rivet {
| | | | 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 |
::WS::Channel::ReturnData \
$sock \
"text/xml; charset=UTF-8" \
"<html><head><title>Webservice Error</title></head><body><h2>$msg</h2></body></html>" \
404
}
rivet {
headers type "text/html; charset=UTF-8"
headers numeric 404
puts "<html><head><title>Webservice Error</title></head><body><h2>$msg</h2></body></html>"
}
aolserver {
::WS::AOLserver::ReturnData \
$sock \
text/html \
"<html><head><title>Webservice Error</title></head><body><h2>$msg</h2></body></html>" \
404
}
wibble {
|
| ︙ | ︙ | |||
771 772 773 774 775 776 777 |
}
embedded {
set xml [GetWsdl $serviceName]
::WS::Embeded::ReturnData $sock "text/xml; charset=UTF-8" $xml 200
}
rivet {
set xml [GetWsdl $serviceName]
| | | 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 |
}
embedded {
set xml [GetWsdl $serviceName]
::WS::Embeded::ReturnData $sock "text/xml; charset=UTF-8" $xml 200
}
rivet {
set xml [GetWsdl $serviceName]
headers type "text/xml; charset=UTF-8"
headers numeric 200
puts $xml
}
aolserver {
set xml [GetWsdl $serviceName]
::WS::AOLserver::ReturnData $sock text/xml $xml 200
}
|
| ︙ | ︙ | |||
838 839 840 841 842 843 844 845 846 847 848 849 850 851 |
variable serviceArr
array set serviceData $serviceArr($serviceName)
set targetNamespace "http://$serviceData(-host)$serviceData(-prefix)"
return [::WS::Utils::GenerateScheme $mode $serviceName $doc $parent $targetNamespace]
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 |
variable serviceArr
array set serviceData $serviceArr($serviceName)
set targetNamespace "http://$serviceData(-host)$serviceData(-prefix)"
return [::WS::Utils::GenerateScheme $mode $serviceName $doc $parent $targetNamespace]
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
#
# Procedure Name : ::WS::Server::generateJsonInfo
#
# Description : Generate an json description of the service, the operations
# and all applicable type definitions.
#
# Arguments :
# serviceName - The name of the service
# sock - The socket to return the WSDL on
# args - not used
#
# Returns :
# 1 - On error
# 0 - On success
#
# Side-Effects : None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : None
#
# Original Author : James Sulak
#
#>>END PRIVATE<<
#
# 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 05/16/2012 J.Sulak Initial version
#
#
###########################################################################
# NOTE: This proc only works with Rivet
# TODO: Update to handle jsonp?
proc ::WS::Server::generateJsonInfo { service sock args } {
variable serviceArr
variable procInfo
::log::log debug "Generating JSON Documentation for $service on $sock with {$args}"
set serviceInfo $serviceArr($service)
array set serviceData $serviceInfo
set doc [yajl create #auto -beautify $serviceData(-beautifyJson)]
$doc map_open
$doc string operations array_open
::log::log debug "\tDisplay Operations (json)"
foreach oper [lsort -dictionary [dict get $procInfo $service operationList]] {
$doc map_open
# operation name
$doc string name string $oper
# description
set description [dict get $procInfo $service op$oper docs]
$doc string description string $description
# parameters
if {[llength [dict get $procInfo $service op$oper argOrder]]} {
$doc string inputs array_open
foreach arg [dict get $procInfo $service op$oper argOrder] {
::log::log debug "\t\t\tDisplaying '$arg'"
if {[dict exists $procInfo $service op$oper argList $arg comment]} {
set comment [dict get $procInfo $service op$oper argList $arg comment]
} else {
set comment {}
}
set type [dict get $procInfo $service op$oper argList $arg type]
$doc map_open string name string $arg string type string $type string comment string $comment map_close
}
$doc array_close
} else {
$doc string inputs array_open array_close
}
$doc string returns map_open
if {[dict exists $procInfo $service op$oper returnInfo comment]} {
set comment [dict get $procInfo $service op$oper returnInfo comment]
} else {
set comment {}
}
set type [dict get $procInfo $service op$oper returnInfo type]
$doc string comment string $comment string type string $type
$doc map_close
$doc map_close
}
$doc array_close
::log::log debug "\tDisplay custom types"
$doc string types array_open
set localTypeInfo [::WS::Utils::GetServiceTypeDef Server $service]
foreach type [lsort -dictionary [dict keys $localTypeInfo]] {
::log::log debug "\t\tDisplaying '$type'"
$doc map_open
$doc string name string $type
$doc string fields array_open
set typeDetails [dict get $localTypeInfo $type definition]
foreach part [lsort -dictionary [dict keys $typeDetails]] {
::log::log debug "\t\t\tDisplaying '$part'"
set subType [dict get $typeDetails $part type]
set comment {}
if {[dict exists $typeDetails $part comment]} {
set comment [dict get $typeDetails $part comment]
}
$doc map_open string field string $part string type string $subType string comment string $comment map_close
}
$doc array_close
$doc map_close
}
$doc array_close
$doc map_close
set contentType "application/json; charset=UTF-8"
headers type $contentType
headers numeric 200
puts [$doc get]
$doc delete
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
|
| ︙ | ︙ | |||
987 988 989 990 991 992 993 |
::WS::Embeded::ReturnData $sock "text/html; charset=UTF-8" $msg 200
}
channel {
::WS::Channel::ReturnData $sock "text/html; charset=UTF-8" $msg 200
}
rivet {
headers numeric 200
| | | 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 |
::WS::Embeded::ReturnData $sock "text/html; charset=UTF-8" $msg 200
}
channel {
::WS::Channel::ReturnData $sock "text/html; charset=UTF-8" $msg 200
}
rivet {
headers numeric 200
headers type "text/html; charset=UTF-8"
puts $msg
}
aolserver {
::WS::AOLserver::ReturnData $sock text/html $msg 200
}
wibble {
upvar 1 [lindex $args 0] responseDict
|
| ︙ | ︙ | |||
1042 1043 1044 1045 1046 1047 1048 |
# Version Date Programmer Comments / Changes / Reasons
# ------- ---------- ---------- -------------------------------------------
# 1 07/06/2006 G.Lester Initial version
#
#
###########################################################################
proc ::WS::Server::displayType {serviceName type} {
| | | 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 |
# Version Date Programmer Comments / Changes / Reasons
# ------- ---------- ---------- -------------------------------------------
# 1 07/06/2006 G.Lester Initial version
#
#
###########################################################################
proc ::WS::Server::displayType {serviceName type} {
set testType [string trimright $type {()?}]
if {([lindex [::WS::Utils::TypeInfo Server $serviceName $testType] 0] == 0) &&
([info exists ::WS::Utils::simpleTypes($testType)])} {
set result $type
} else {
set result [format {<a href="#type_%1$s">%2$s</a>} $testType $type]
}
return $result
|
| ︙ | ︙ | |||
1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 |
set inXML [dict get $requestDict post xml ""]
}
default {
upvar #0 Httpd$sock data
set inXML $data(query)
}
}
::log::log debug "In ::WS::Server::callOperation {$service $sock $args}"
array set serviceInfo $serviceArr($service)
::log::log debug "\tDocument is {$inXML}"
set ::errorInfo {}
set ::errorCode {}
set ns $service
set inTransform $serviceInfo(-intransform)
set outTransform $serviceInfo(-outtransform)
| > > > > > > | | | < > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | < < | < | | | | | | | | | | | | | | | | | | > | > > > > > | | > > > | > > > > > > | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < | < | | | < | < | | | | | | | < | < > | | | < | < | | | | | | | | | | | | | | > > > > > > | | > > > | > > > > > > | | | | | | | | | 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 |
set inXML [dict get $requestDict post xml ""]
}
default {
upvar #0 Httpd$sock data
set inXML $data(query)
}
}
# decide if SOAP or REST mode should be used.
set flavor "soap"
if {[lsearch -exact $args "-rest"] != -1} {
set flavor "rest"
}
::log::log debug "In ::WS::Server::callOperation {$service $sock $args}"
array set serviceInfo $serviceArr($service)
::log::log debug "\tDocument is {$inXML}"
set ::errorInfo {}
set ::errorCode {}
set ns $service
set inTransform $serviceInfo(-intransform)
set outTransform $serviceInfo(-outtransform)
# set first [string first {<} $inXML]
# if {$first > 0} {
# set inXML [string range $inXML $first end]
# }
if {![string equal $inTransform {}]} {
set inXML [$inTransform REQUEST $inXML]
}
# Get a reference to the error callback
set errorCallback $serviceInfo(-errorCallback)
##
## Parse the input and determine the name of the method being invoked.
##
switch -exact -- $flavor {
rest {
package require yajltcl ; # only needed for rest, not soap.
set operation [lindex $inXML 0]
set contentType "application/json"
set doc ""
array set rawargs [lindex $inXML 1]
if {[info exists rawargs(jsonp_callback)]} {
if {![regexp {^[a-zA-Z_0-9]+$} $rawargs(jsonp_callback)]} {
# sanitize the JSONP callback function name for security.
set rawargs(jsonp_callback) FlightXmlCallback
}
set contentType "text/javascript"
}
}
soap {
# parse the XML request
dom parse $inXML doc
$doc documentElement top
::log::log debug [list $doc selectNodesNamespaces \
[list ENV http://schemas.xmlsoap.org/soap/envelope/ \
$service http://$serviceInfo(-host)$serviceInfo(-prefix)]]
$doc selectNodesNamespaces \
[list ENV http://schemas.xmlsoap.org/soap/envelope/ \
$service http://$serviceInfo(-host)$serviceInfo(-prefix)]
$doc documentElement rootNode
# extract the name of the method
set top [$rootNode selectNodes /ENV:Envelope/ENV:Body/*]
catch {$top localName} requestMessage
set legacyRpcMode 0
if {$requestMessage == ""} {
# older RPC/Encoded clients need to try nodeName instead.
# Python pySoap needs this.
catch {$top nodeName} requestMessage
set legacyRpcMode 1
}
::log::log debug "requestMessage = {$requestMessage}"
if {[string match {*Request} $requestMessage]} {
set operation [string range $requestMessage 0 end-7]
} else {
# broken clients might not have sent the correct Document Wrapped name.
# Python pySoap and Perl SOAP::Lite need this.
set operation $requestMessage
set legacyRpcMode 1
}
set contentType "text/xml"
}
default {
if {$errorCallback ne {}} { $errorCallback "BAD_FLAVOR No supported protocol" {} "UnknownMethod" $flavor }
error "bad flavor"
}
}
##
## Check that the method exists.
##
if {![dict exists $procInfo $service op$operation argList]} {
set msg "Method $operation not found"
::log::log error $msg
set ::errorInfo {}
set ::errorCode [list Server UNKNOWN_METHOD $operation]
set response [generateError \
$serviceInfo(-traceEnabled) \
CLIENT \
$msg \
[list "errorCode" $::errorCode "stackTrace" $::errorInfo] \
$flavor]
catch {$doc delete}
set httpStatus 404
if {$errorCallback ne {}} { $errorCallback "UNKNOWN_METHOD $msg" httpStatus $operation $flavor }
::log::log debug "Leaving @ error 1::WS::Server::callOperation $response"
# wrap in JSONP
if {$flavor == "rest" && [info exists rawargs(jsonp_callback)]} {
set response "$rawargs(jsonp_callback)($response)"
}
switch -exact -- $mode {
tclhttpd {
::Httpd_ReturnData $sock "$contentType; charset=UTF-8" $response $httpStatus
}
embedded {
::WS::Embeded::ReturnData $sock "$contentType; charset=UTF-8" $response $httpStatus
}
rivet {
headers type "$contentType; charset=UTF-8"
headers numeric $httpStatus
puts $response
}
aolserver {
::WS::AOLserver::ReturnData $sock "$contentType; charset=UTF-8" $response $httpStatus
}
wibble {
::WS::Wibble::ReturnData responseDict "$contentType; charset=UTF-8" $response $httpStatus
}
default {
## Do nothing
}
}
return;
}
set baseName $operation
set cmdName op$baseName
set methodName "${ns}::$baseName"
##
## Parse the arguments for the method.
##
set argInfo [dict get $procInfo $ns $cmdName argList]
if {[catch {
# Check that all supplied arguments are valid
set methodArgs [dict get $procInfo $ns $cmdName argOrder]
if {$serviceInfo(-verifyUserArgs)} {
foreach {key value} [array get rawargs] {
if {[lsearch -exact $methodArgs $key] == -1} {
error "Invalid argument '$key' supplied"
}
}
}
switch -exact -- $flavor {
rest {
set tclArgList {}
foreach argName $methodArgs {
set argType [string trim [dict get $argInfo $argName type]]
set typeInfoList [::WS::Utils::TypeInfo Server $service $argType]
if {![info exists rawargs($argName)]} {
::log::log debug "did not find argument for $argName, leaving blank"
lappend tclArgList {}
continue
}
switch -exact -- $typeInfoList {
{0 0} {
## Simple non-array
lappend tclArgList $rawargs($argName)
}
{0 1} {
## Simple array
lappend tclArgList $rawargs($argName)
}
{1 0} {
## Non-simple non-array
error "TODO JSON"
#lappend tclArgList [::WS::Utils::convertTypeToDict Server $service $node $argType $top]
}
{1 1} {
## Non-simple array
error "TODO JSON"
#set tmp {}
#set argType [string trimright $argType {()?}]
#foreach row $node {
# lappend tmp [::WS::Utils::convertTypeToDict Server $service $row $argType $top]
#}
#lappend tclArgList $tmp
}
default {
## Do nothing
}
}
}
}
soap {
foreach pass [list 1 2 3] {
set tclArgList {}
set gotAnyArgs 0
set argIndex 0
foreach argName $methodArgs {
set argType [string trim [dict get $argInfo $argName type]]
set typeInfoList [::WS::Utils::TypeInfo Server $service $argType]
if {$pass == 1} {
# access arguments by name using full namespace
set path $service:$argName
set node [$top selectNodes $path]
} elseif {$pass == 2} {
# legacyRpcMode only, access arguments by unqualified name
set path $argName
set node [$top selectNodes $path]
} else {
# legacyRpcMode only, access arguments by index
set path "legacy argument index $argIndex"
set node [lindex [$top childNodes] $argIndex]
incr argIndex
}
if {[string equal $node {}]} {
::log::log debug "did not find argument for $argName using $path, leaving blank"
lappend tclArgList {}
continue
}
::log::log debug "found argument $argName using $path, processing $node"
set gotAnyArgs 1
switch -exact -- $typeInfoList {
{0 0} {
## Simple non-array
lappend tclArgList [$node asText]
}
{0 1} {
## Simple array
set tmp {}
foreach row $node {
lappend tmp [$row asText]
}
lappend tclArgList $tmp
}
{1 0} {
## Non-simple non-array
set argType [string trimright $argType {?}]
lappend tclArgList [::WS::Utils::convertTypeToDict Server $service $node $argType $top]
}
{1 1} {
## Non-simple array
set tmp {}
set argType [string trimright $argType {()?}]
foreach row $node {
lappend tmp [::WS::Utils::convertTypeToDict Server $service $row $argType $top]
}
lappend tclArgList $tmp
}
default {
## Do nothing
}
}
}
::log::log debug "gotAnyArgs $gotAnyArgs, legacyRpcMode $legacyRpcMode"
if {$gotAnyArgs || !$legacyRpcMode} break
}
}
default {
if {$errorCallback ne {}} { $errorCallback "BAD_FLAVOR No supported protocol" {} $operation $flavor }
error "invalid flavor"
}
}
::log::log debug "finalargs $tclArgList"
} errMsg]} {
::log::log error $errMsg
set localerrorCode $::errorCode
set localerrorInfo $::errorInfo
set response [generateError \
$serviceInfo(-traceEnabled) \
CLIENT \
"Error Parsing Arguments -- $errMsg" \
[list "errorCode" $localerrorCode "stackTrace" $localerrorInfo] \
$flavor]
catch {$doc delete}
set httpStatus 400
if {$errorCallback ne {}} { $errorCallback "INVALID_ARGUMENT $errMsg" httpStatus $operation $flavor }
::log::log debug "Leaving @ error 3::WS::Server::callOperation $response"
# wrap in JSONP
if {$flavor == "rest" && [info exists rawargs(jsonp_callback)]} {
set response "$rawargs(jsonp_callback)($response)"
}
switch -exact -- $mode {
tclhttpd {
::Httpd_ReturnData $sock "$contentType; charset=UTF-8" $response $httpStatus
}
embedded {
::WS::Embeded::ReturnData $sock "$contentType; charset=UTF-8" $response $httpStatus
}
channel {
::WS::Channel::ReturnData $sock "$contentType; charset=UTF-8" $response $httpStatus
}
rivet {
headers type "$contentType; charset=UTF-8"
headers numeric $httpStatus
puts $response
}
aolserver {
::WS::AOLserver::ReturnData $sock "$contentType; charset=UTF-8" $response $httpStatus
}
wibble {
::WS::Wibble::ReturnData responseDict "$contentType; charset=UTF-8" $response $httpStatus
}
default {
## Do nothing
}
}
return;
}
|
| ︙ | ︙ | |||
1371 1372 1373 1374 1375 1376 1377 |
default {
lappend cmd $ns $baseName $data(ipaddr) $data(headerlist) $headerList
}
}
eval $cmd
set results [eval \$methodName $tclArgList]
# generate a reply packet
| | > > > > > > > > | > > > < | | | | | | | | | | | > > > | > > > > > > | | | > > > > | | | | | | 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 |
default {
lappend cmd $ns $baseName $data(ipaddr) $data(headerlist) $headerList
}
}
eval $cmd
set results [eval \$methodName $tclArgList]
# generate a reply packet
set response [generateReply $ns $baseName $results $flavor]
# wrap in JSONP
if {$flavor == "rest" && [info exists rawargs(jsonp_callback)]} {
set response "$rawargs(jsonp_callback)($response)"
}
# mangle the XML declaration
if {$flavor == "soap"} {
# regsub "<!DOCTYPE\[^>\]+>\n" $response {} response
set response [string map {{<?xml version="1.0"?>} {<?xml version="1.0" encoding="utf-8"?>}} $response]
}
catch {$doc delete}
if {![string equal $outTransform {}]} {
set response [$outTransform REPLY $response $operation $results]
}
if {[info exists serviceInfo(-postmonitor)] &&
[string length $serviceInfo(-postmonitor)]} {
set precmd $serviceInfo(-postmonitor)
lappend precmd POST $service $operation OK $results
catch $precmd
}
::log::log debug "Leaving ::WS::Server::callOperation $response"
switch -exact -- $mode {
tclhttpd {
::Httpd_ReturnData $sock "$contentType; charset=UTF-8" $response 200
}
embedded {
::WS::Embeded::ReturnData $sock "$contentType; charset=UTF-8" $response 200
}
channel {
::WS::Channel::ReturnData $sock "$contentType; charset=UTF-8" $response 200
}
rivet {
headers type "$contentType; charset=UTF-8"
headers numeric 200
puts $response
}
aolserver {
::WS::AOLserver::ReturnData $sock "$contentType; charset=UTF-8" $response 200
}
wibble {
::WS::Wibble::ReturnData responseDict "$contentType; charset=UTF-8" $response 200
}
default {
## Do nothing
}
}
} msg]} {
##
## Handle errors
##
set localerrorCode $::errorCode
set localerrorInfo $::errorInfo
if {[info exists serviceInfo(-postmonitor)] &&
[string length $serviceInfo(-postmonitor)]} {
set precmd $serviceInfo(-postmonitor)
lappend precmd POST $service $operation ERROR $msg
catch $precmd
}
set response [generateError \
$serviceInfo(-traceEnabled) \
CLIENT \
$msg \
[list "errorCode" $localerrorCode "stackTrace" $localerrorInfo] \
$flavor]
catch {$doc delete}
set httpStatus 500
if {$errorCallback ne {}} { $errorCallback $msg httpStatus $operation $flavor }
::log::log debug "Leaving @ error 2::WS::Server::callOperation $response"
# wrap in JSONP
if {$flavor == "rest" && [info exists rawargs(jsonp_callback)]} {
set response "$rawargs(jsonp_callback)($response)"
}
switch -exact -- $mode {
tclhttpd {
::Httpd_ReturnData $sock "$contentType; charset=UTF-8" $response $httpStatus
}
embedded {
::WS::Embeded::ReturnData $sock "$contentType; charset=UTF-8" $response $httpStatus
}
channel {
::WS::Channel::ReturnData $sock "$contentType; charset=UTF-8" $response $httpStatus
}
rivet {
if {[lindex $localerrorCode 0] == "RIVET" && [lindex $localerrorCode 1] == "ABORTPAGE"} {
# if we caught an abort_page, then re-trigger it.
abort_page
}
headers type "$contentType; charset=UTF-8"
headers numeric $httpStatus
puts $response
}
aolserver {
::WS::AOLserver::ReturnData $sock $contentType $response $httpStatus
}
wibble {
::WS::Wibble::ReturnData responseDict "$contentType; charset=UTF-8" $response $httpStatus
}
default {
## Do nothing
}
}
return;
}
|
| ︙ | ︙ | |||
1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 | # Description : Generate a standard error packet # # Arguments : # includeTrace - Boolean indicate if the trace is to be included. # faultcode - The code describing the error # faultstring - The string describing the error. # detail - Optional details of error. # # Returns : XML formatted standard error packet # # Side-Effects : None # # Exception Conditions : None # | > | 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 | # Description : Generate a standard error packet # # Arguments : # includeTrace - Boolean indicate if the trace is to be included. # faultcode - The code describing the error # faultstring - The string describing the error. # detail - Optional details of error. # flavor - Output mode: "soap" or "rest" # # Returns : XML formatted standard error packet # # Side-Effects : None # # Exception Conditions : None # |
| ︙ | ︙ | |||
1498 1499 1500 1501 1502 1503 1504 | # # Version Date Programmer Comments / Changes / Reasons # ------- ---------- ---------- ------------------------------------------- # 1 07/06/2006 G.Lester Initial version # # ########################################################################### | | > > > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > | | > | 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 |
#
# Version Date Programmer Comments / Changes / Reasons
# ------- ---------- ---------- -------------------------------------------
# 1 07/06/2006 G.Lester Initial version
#
#
###########################################################################
proc ::WS::Server::generateError {includeTrace faultcode faultstring detail flavor} {
::log::log debug "Entering ::WS::Server::generateError $faultcode $faultstring {$detail}"
set code [lindex $detail 1]
switch -exact -- $code {
"VersionMismatch" {
set code "SOAP-ENV:VersionMismatch"
}
"MustUnderstand" {
set code "SOAP-ENV:MustUnderstand"
}
"Client" {
set code "SOAP-ENV:Client"
}
"Server" {
set code "SOAP-ENV:Server"
}
default {
## Do nothing
}
}
# FlightAware-specific error logging
if {$flavor == "rest"} {
if {[string match "QUIET*" $faultstring]} {
set faultstring [regsub {^QUIET\s*} $faultstring {}]
} else {
flightaware_error_sql "::WebServices::Server::generateError caught an error '$faultstring' code '$faultcode': $detail" warning
}
}
switch -exact -- $flavor {
rest {
set doc [yajl create #auto]
$doc map_open string "error" string $faultstring map_close
set response [$doc get]
$doc delete
}
soap {
dom createDocument "SOAP-ENV:Envelope" doc
$doc documentElement env
$env setAttribute \
"xmlns:SOAP-ENV" "http://schemas.xmlsoap.org/soap/envelope/" \
"xmlns:xsi" "http://www.w3.org/1999/XMLSchema-instance" \
"xmlns:xsd" "http://www.w3.org/1999/XMLSchema" \
"xmlns:SOAP-ENC" "http://schemas.xmlsoap.org/soap/encoding/"
$env appendChild [$doc createElement "SOAP-ENV:Body" bod]
$bod appendChild [$doc createElement "SOAP-ENV:Fault" flt]
$flt appendChild [$doc createElement "faultcode" fcd]
$fcd appendChild [$doc createTextNode $faultcode]
$flt appendChild [$doc createElement "faultstring" fst]
$fst appendChild [$doc createTextNode $faultstring]
if { $detail != {} } {
$flt appendChild [$doc createElement "SOAP-ENV:detail" dtl0]
$dtl0 appendChild [$doc createElement "e:errorInfo" dtl]
$dtl setAttribute "xmlns:e" "urn:TclErrorInfo"
foreach {detailName detailInfo} $detail {
if {!$includeTrace && $detailName == "stackTrace"} {
continue
}
$dtl appendChild [$doc createElement $detailName err]
$err appendChild [$doc createTextNode $detailInfo]
}
}
# serialize the DOM document and return the XML text
append response \
{<?xml version="1.0" encoding="utf-8"?>} \
"\n" \
[$doc asXML -indent none -doctypeDeclaration 0]
$doc delete
}
default {
error "unsupported flavor"
}
}
::log::log debug "Leaving (error) ::WS::Server::generateError $response"
return $response
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
#
# Procedure Name : :WS::Server::generateReply
#
# Description : Generate the reply packet for an operation
#
# Arguments :
# serviceName - The name of the service
# operation - The name of the operation
# results - The results as a dictionary object
# flavor - Output mode: "soap" or "rest"
#
#
# Returns : The results as an XML formatted packet.
#
# Side-Effects : None
#
# Exception Conditions : None
|
| ︙ | ︙ | |||
1595 1596 1597 1598 1599 1600 1601 | # # Version Date Programmer Comments / Changes / Reasons # ------- ---------- ---------- ------------------------------------------- # 1 07/06/2006 G.Lester Initial version # # ########################################################################### | | > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > | | | 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 |
#
# Version Date Programmer Comments / Changes / Reasons
# ------- ---------- ---------- -------------------------------------------
# 1 07/06/2006 G.Lester Initial version
#
#
###########################################################################
proc ::WS::Server::generateReply {serviceName operation results flavor} {
::log::log debug "Entering ::WS::Server::generateReply $serviceName $operation {$results}"
variable serviceArr
array set serviceData $serviceArr($serviceName)
switch -exact -- $flavor {
rest {
set doc [yajl create #auto -beautify $serviceData(-beautifyJson)]
$doc map_open
::WS::Utils::convertDictToJson Server $serviceName $doc $results ${serviceName}:${operation}Results
$doc map_close
set output [$doc get]
$doc delete
}
soap {
if {[info exists ::Config(docRoot)] && [file exists [file join $::Config(docRoot) $serviceName $operation.css]]} {
set replaceText [format {<?xml-stylesheet type="text/xsl" href="http://%s/css/%s/%s.css"?>}\
$serviceData(-host) \
$serviceName \
$operation]
append replaceText "\n"
} else {
set replaceText {}
}
dom createDocument "SOAP-ENV:Envelope" doc
$doc documentElement env
$env setAttribute \
"xmlns:SOAP-ENV" "http://schemas.xmlsoap.org/soap/envelope/" \
"xmlns:xsi" "http://www.w3.org/1999/XMLSchema-instance" \
"xmlns:xsd" "http://www.w3.org/1999/XMLSchema" \
"xmlns:SOAP-ENC" "http://schemas.xmlsoap.org/soap/encoding/" \
xmlns:$serviceName "http://$serviceData(-host)$serviceData(-prefix)"
if {[llength $serviceData(-outheaders)]} {
$env appendChild [$doc createElement "SOAP-ENV:Header" header]
foreach headerType $serviceData(-outheaders) {
#$header appendChild [$doc createElement ${serviceName}:${headerType} part]
#::WS::Utils::convertDictToType Server $serviceName $doc $part $results $headerType
::WS::Utils::convertDictToType Server $serviceName $doc $header $results $headerType
}
}
$env appendChild [$doc createElement "SOAP-ENV:Body" body]
$body appendChild [$doc createElement ${serviceName}:${operation}Results reply]
::WS::Utils::convertDictToType Server $serviceName $doc $reply $results ${serviceName}:${operation}Results
append output \
{<?xml version="1.0" encoding="utf-8"?>} \
"\n" \
[$doc asXML -indent none -doctypeDeclaration 0]
#regsub "<!DOCTYPE\[^>\]*>\n" [::dom::DOMImplementation serialize $doc] $replaceText xml
$doc delete
}
default {
error "Unsupported flavor"
}
}
::log::log debug "Leaving ::WS::Server::generateReply $output"
return $output
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
|
| ︙ | ︙ | |||
1913 1914 1915 1916 1917 1918 1919 |
append msg [::html::closeTag]
append msg "\n"
append msg [::html::h4 {Inputs}] "\n"
append msg [::html::openTag div {style="margin-left: 40px;"}]
| > > | | | | | | | | | | | | | | | | > > > | 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 |
append msg [::html::closeTag]
append msg "\n"
append msg [::html::h4 {Inputs}] "\n"
append msg [::html::openTag div {style="margin-left: 40px;"}]
if {[llength [dict get $procInfo $service op$oper argOrder]]} {
append msg [::html::openTag {table} {border="2"}]
append msg [::html::hdrRow Name Type Description]
foreach arg [dict get $procInfo $service op$oper argOrder] {
::log::log debug "\t\t\tDisplaying '$arg'"
if {[dict exists $procInfo $service op$oper argList $arg comment]} {
set comment [dict get $procInfo $service op$oper argList $arg comment]
} else {
set comment {}
}
append msg [::html::row \
$arg \
[displayType $service [dict get $procInfo $service op$oper argList $arg type]] \
$comment \
]
}
append msg [::html::closeTag]
} else {
append msg "No inputs."
}
append msg [::html::closeTag]
::log::log debug "\t\tReturns"
append msg [::html::h4 {Returns}] "\n"
append msg [::html::openTag div {style="margin-left: 40px;"}]
append msg [::html::openTag {table} {border="2"}]
|
| ︙ | ︙ | |||
2016 2017 2018 2019 2020 2021 2022 2023 |
::log::log debug "\tDisplay custom types"
set service [dict get $serviceInfo -service]
append msg [::html::h2 {<a id='CustomTypeDetails'>Custom Types</a>}]
set localTypeInfo [::WS::Utils::GetServiceTypeDef Server $service]
foreach type [lsort -dictionary [dict keys $localTypeInfo]] {
::log::log debug "\t\tDisplaying '$type'"
set typeOverloadArray($type) 1
| > | | > > > > > | > | 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 |
::log::log debug "\tDisplay custom types"
set service [dict get $serviceInfo -service]
append msg [::html::h2 {<a id='CustomTypeDetails'>Custom Types</a>}]
set localTypeInfo [::WS::Utils::GetServiceTypeDef Server $service]
foreach type [lsort -dictionary [dict keys $localTypeInfo]] {
::log::log debug "\t\tDisplaying '$type'"
set href_type [lindex [split $type :] end]
set typeOverloadArray($type) 1
append msg [::html::h3 "<a id='type_${href_type}'>$type</a>"]
set typeDetails [dict get $localTypeInfo $type definition]
append msg [::html::openTag {table} {border="2"}]
append msg [::html::hdrRow Field Type Comment]
foreach part [lsort -dictionary [dict keys $typeDetails]] {
::log::log debug "\t\t\tDisplaying '$part'"
if {[dict exists $typeDetails $part comment]} {
set comment [dict get $typeDetails $part comment]
} else {
set comment {}
}
append msg [::html::row \
$part \
[displayType $service [dict get $typeDetails $part type]] \
$comment
]
}
append msg [::html::closeTag]
}
append msg "\n<br/>\n<center>" [::html::minorMenu $menuList] "</center>"
append msg "\n<hr/>\n"
|
| ︙ | ︙ |
Changes to Utilities.tcl.
| ︙ | ︙ | |||
55 56 57 58 59 60 61 |
}
}
package require log
package require tdom 0.8
package require struct::set
| | > > > > > > > > > > > > > > > > > > > > > > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 |
}
}
package require log
package require tdom 0.8
package require struct::set
package provide WS::Utils 2.4.0
namespace eval ::WS {}
namespace eval ::WS::Utils {
set ::WS::Utils::typeInfo {}
set ::WS::Utils::currentSchema {}
array set ::WS::Utils::importedXref {}
set nsList {
w http://schemas.xmlsoap.org/wsdl/
d http://schemas.xmlsoap.org/wsdl/soap/
xs http://www.w3.org/2001/XMLSchema
}
# mapping of how the simple SOAP types should be serialized using YAJL into JSON.
array set ::WS::Utils::simpleTypesJson {
boolean "bool"
float "number"
double "double"
integer "integer"
int "integer"
long "integer"
short "integer"
byte "integer"
nonPositiveInteger "integer"
negativeInteger "integer"
nonNegativeInteger "integer"
unsignedLong "integer"
unsignedInt "integer"
unsignedShort "integer"
unsignedByte "integer"
positiveInteger "integer"
decimal "number"
}
array set ::WS::Utils::simpleTypes {
anyType 1
string 1
boolean 1
decimal 1
float 1
double 1
|
| ︙ | ︙ | |||
125 126 127 128 129 130 131 |
parseInAttr 0
genOutAttr 0
valueAttrCompatiblityMode 1
includeDirectory {}
suppressNS {}
useTypeNs 0
nsOnChangeOnly 0
| | | 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 |
parseInAttr 0
genOutAttr 0
valueAttrCompatiblityMode 1
includeDirectory {}
suppressNS {}
useTypeNs 0
nsOnChangeOnly 0
anyType string
}
set ::WS::Utils::standardAttributes {
baseType
comment
pattern
length
|
| ︙ | ︙ | |||
215 216 217 218 219 220 221 |
proc ::WS::Utils::GetCrossreference {mode service} {
variable typeInfo
array set crossreference {}
dict for {type typeDict} [dict get $typeInfo $mode $service] {
foreach {field fieldDict} [dict get $typeDict definition] {
| | | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 |
proc ::WS::Utils::GetCrossreference {mode service} {
variable typeInfo
array set crossreference {}
dict for {type typeDict} [dict get $typeInfo $mode $service] {
foreach {field fieldDict} [dict get $typeDict definition] {
set fieldType [string trimright [dict get $fieldDict type] {()?}]
incr crossreference($fieldType,count)
lappend crossreference($fieldType,usedBy) $type.$field
}
if {![info exists crossreference($type,count) ]} {
set crossreference($type,count) 0
set crossreference($type,usedBy) {}
}
|
| ︙ | ︙ | |||
561 562 563 564 565 566 567 |
#
#
###########################################################################
proc ::WS::Utils::GetServiceTypeDef {mode service {type {}}} {
variable typeInfo
variable simpleTypes
| | | 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 |
#
#
###########################################################################
proc ::WS::Utils::GetServiceTypeDef {mode service {type {}}} {
variable typeInfo
variable simpleTypes
set type [string trimright $type {()?}]
set results {}
if {[string equal $type {}]} {
::log::log debug "@1"
set results [dict get $typeInfo $mode $service]
} else {
set typeInfoList [TypeInfo $mode $service $type]
if {[string equal -nocase -length 3 $type {xs:}]} {
|
| ︙ | ︙ | |||
651 652 653 654 655 656 657 |
# 1 07/06/2006 G.Lester Initial version
#
#
###########################################################################
proc ::WS::Utils::GetServiceSimpleTypeDef {mode service {type {}}} {
variable simpleTypes
| | | 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 |
# 1 07/06/2006 G.Lester Initial version
#
#
###########################################################################
proc ::WS::Utils::GetServiceSimpleTypeDef {mode service {type {}}} {
variable simpleTypes
set type [string trimright $type {()?}]
if {[string equal -nocase -length 3 $type {xs:}]} {
return [::WS::Utils::GetServiceTypeDef $mode $service $type]
}
if {[string equal $type {}]} {
set results {}
foreach {key value} [array get simpleTypes $mode,$service,*] {
lappend results [list [lindex [split $key {,}] end] $simpleTypes($key)]
|
| ︙ | ︙ | |||
911 912 913 914 915 916 917 | # that you update this header block. Thanks. # #>>BEGIN PUBLIC<< # # Procedure Name : ::WS::Utils::TypeInfo # # Description : Return a list indicating if the type is simple or complex | | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 | # that you update this header block. Thanks. # #>>BEGIN PUBLIC<< # # Procedure Name : ::WS::Utils::TypeInfo # # Description : Return a list indicating if the type is simple or complex # and if it is a scalar or an array. Also if it is optional # # Arguments : # type - the type name, possibly with a () to specify it is an array # # Returns : A list of two elements, as follows: # 0|1 - 0 means a simple type, 1 means a complex type # 0|1 - 0 means a scalar, 1 means an array |
| ︙ | ︙ | |||
941 942 943 944 945 946 947 | # Version Date Programmer Comments / Changes / Reasons # ------- ---------- ---------- ------------------------------------------- # 1 07/06/2006 G.Lester Initial version # 2.3.0 10/16/2012 G. Lester Corrected detection of service specific simple type. # 2.3.0 10/31/2012 G. Lester Corrected missing newline. # ########################################################################### | | > > > > > > > > | 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 |
# Version Date Programmer Comments / Changes / Reasons
# ------- ---------- ---------- -------------------------------------------
# 1 07/06/2006 G.Lester Initial version
# 2.3.0 10/16/2012 G. Lester Corrected detection of service specific simple type.
# 2.3.0 10/31/2012 G. Lester Corrected missing newline.
#
###########################################################################
proc ::WS::Utils::TypeInfo {mode service type {findOptional 0}} {
variable simpleTypes
variable typeInfo
set type [string trim $type]
set isOptional 0
if {[string equal [string index $type end] {?}]} {
set isOptional 1
set type [string trimright $type {?}]
}
if {[string equal [string range $type end-1 end] {()}]} {
set isArray 1
set type [string range $type 0 end-2]
} elseif {[string equal $type {array}]} {
set isArray 1
} else {
set isArray 0
}
#set isNotSimple [dict exists $typeInfo $mode $service $type]
#set isNotSimple [expr {$isNotSimple || [dict exists $typeInfo $mode $service $service:$type]}]
lassign [split $type {:}] tns baseType
set isNotSimple [expr {!([info exist simpleTypes($type)] || [info exist simpleTypes($baseType)] || [info exist simpleTypes($mode,$service,$type)] || [info exist simpleTypes($mode,$service,$baseType)] )}]
if {$findOptional} {
return [list $isNotSimple $isArray $isOptional]
}
return [list $isNotSimple $isArray]
}
###########################################################################
#
# Public Procedure Header - as this procedure is modified, please be sure
|
| ︙ | ︙ | |||
1270 1271 1272 1273 1274 1275 1276 |
# 1 07/06/2006 G.Lester Initial version
# 2 02/03/2008 G.Lester Moved into WS::Utils namespace
#
###########################################################################
proc ::WS::Utils::getTypeWSDLInfo {mode serviceName field type} {
set typeInfo {maxOccurs 1 minOccurs 1 name * type *}
dict set typeInfo name $field
| | | | > > > | 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 |
# 1 07/06/2006 G.Lester Initial version
# 2 02/03/2008 G.Lester Moved into WS::Utils namespace
#
###########################################################################
proc ::WS::Utils::getTypeWSDLInfo {mode serviceName field type} {
set typeInfo {maxOccurs 1 minOccurs 1 name * type *}
dict set typeInfo name $field
set typeList [TypeInfo $mode $serviceName $type 1]
if {[lindex $typeList 0] == 0} {
dict set typeInfo type xs:[string trimright $type {()?}]
} else {
dict set typeInfo type $serviceName:[string trimright $type {()?}]
}
if {[lindex $typeList 1]} {
dict set typeInfo maxOccurs unbounded
}
if {[lindex $typeList 2]} {
dict set typeInfo minOccurs 0
}
return $typeInfo
}
###########################################################################
|
| ︙ | ︙ | |||
1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 |
# }
#}
set partsList [dict keys [dict get $typeDefInfo definition]]
::log::log debug "\t partsList is {$partsList}"
set arrayOverride [expr {$isArray && ([llength $partsList] == 1)}]
foreach partName $partsList {
set partType [dict get $typeDefInfo definition $partName type]
if {[dict exists $typeDefInfo definition $partName allowAny] && [dict get $typeDefInfo definition $partName allowAny]} {
set allowAny 1
} else {
set allowAny 0
}
if {[string equal $partName *] && [string equal $partType *]} {
##
| > | 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 |
# }
#}
set partsList [dict keys [dict get $typeDefInfo definition]]
::log::log debug "\t partsList is {$partsList}"
set arrayOverride [expr {$isArray && ([llength $partsList] == 1)}]
foreach partName $partsList {
set partType [dict get $typeDefInfo definition $partName type]
set partType [string trimright $partType {?}]
if {[dict exists $typeDefInfo definition $partName allowAny] && [dict get $typeDefInfo definition $partName allowAny]} {
set allowAny 1
} else {
set allowAny 0
}
if {[string equal $partName *] && [string equal $partType *]} {
##
|
| ︙ | ︙ | |||
1465 1466 1467 1468 1469 1470 1471 |
set isAbstract [dict get $typeInfo $mode $serviceName $partType abstract]
}
switch -exact -- $typeInfoList {
{0 0} {
##
## Simple non-array
##
| | | | | | | 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 |
set isAbstract [dict get $typeInfo $mode $serviceName $partType abstract]
}
switch -exact -- $typeInfoList {
{0 0} {
##
## Simple non-array
##
if {[dict exists $tmpTypeInfo base]} {
set baseType [dict get $tmpTypeInfo base]
} else {
set baseType string
}
if {$options(parseInAttr)} {
foreach attrList [$item attributes] {
catch {
lassign $attrList attr nsAlias nsUrl
if {[string equal $nsUrl $xsiNsUrl]} {
set attrValue [$item getAttribute ${nsAlias}:$attr]
dict set results $partName ::$attr $attrValue
|
| ︙ | ︙ | |||
1503 1504 1505 1506 1507 1508 1509 |
}
}
}
{0 1} {
##
## Simple array
##
| | | | | | | 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 |
}
}
}
{0 1} {
##
## Simple array
##
if {[dict exists $tmpTypeInfo base]} {
set baseType [dict get $tmpTypeInfo base]
} else {
set baseType string
}
set tmp {}
foreach row $item {
if {$options(parseInAttr)} {
set rowList {}
foreach attrList [$row attributes] {
catch {
lassign $attrList attr nsAlias nsUrl
|
| ︙ | ︙ | |||
1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 |
# ::log::log debug " Parent xml: [$parent asXML]"
variable typeInfo
variable simpleTypes
variable options
variable standardAttributes
variable currentNs
if {!$options(UseNS)} {
return [::WS::Utils::convertDictToTypeNoNs $mode $service $doc $parent $dict $type]
}
if {$options(valueAttrCompatiblityMode)} {
set valueAttr {}
} else {
set valueAttr {::value}
}
set typeInfoList [TypeInfo $mode $service $type]
::log::log debug "\t typeInfoList = {$typeInfoList}"
if {[dict exists $typeInfo $mode $service $service:$type]} {
set typeName $service:$type
} else {
set typeName $type
}
set itemList {}
| > > | 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 |
# ::log::log debug " Parent xml: [$parent asXML]"
variable typeInfo
variable simpleTypes
variable options
variable standardAttributes
variable currentNs
array set serviceData $::WS::Server::serviceArr($service)
if {!$options(UseNS)} {
return [::WS::Utils::convertDictToTypeNoNs $mode $service $doc $parent $dict $type]
}
if {$options(valueAttrCompatiblityMode)} {
set valueAttr {}
} else {
set valueAttr {::value}
}
set typeInfoList [TypeInfo $mode $service $type]
set type [string trimright $type {?}]
::log::log debug "\t typeInfoList = {$typeInfoList}"
if {[dict exists $typeInfo $mode $service $service:$type]} {
set typeName $service:$type
} else {
set typeName $type
}
set itemList {}
|
| ︙ | ︙ | |||
1773 1774 1775 1776 1777 1778 1779 |
}
set fieldList {}
foreach {itemName itemDef} $itemList {
set baseName [lindex [split $itemName {:}] end]
lappend fieldList $itemName
set itemType [dict get $itemDef type]
::log::log debug "\t\titemName = {$itemName} itemDef = {$itemDef} itemType ={$itemType}"
| | > > > > | | | > > | 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 |
}
set fieldList {}
foreach {itemName itemDef} $itemList {
set baseName [lindex [split $itemName {:}] end]
lappend fieldList $itemName
set itemType [dict get $itemDef type]
::log::log debug "\t\titemName = {$itemName} itemDef = {$itemDef} itemType ={$itemType}"
set typeInfoList [TypeInfo $mode $service $itemType 1]
::log::log debug "Expr [list ![dict exists $dict $itemName] && ![dict exists $dict $baseName]]"
if {![dict exists $dict $itemName] && ![dict exists $dict $baseName]} {
::log::log debug "Neither {$itemName} nor {$baseName} are in dictionary {$dict}, skipping"
# If required parameters are being enforced and this field is not optional, throw an error
if {$serviceData(-enforceRequired) && ![lindex $typeInfoList 2]} {
error "Required field $itemName is missing from response"
}
continue
} elseif {[dict exists $dict $baseName]} {
set useName $baseName
} else {
set useName $itemName
}
set itemXns $xns
set tmpInfo [GetServiceTypeDef $mode $service [string trimright $itemType {()?}]]
if {$options(useTypeNs) && [dict exists $tmpInfo xns]} {
set itemXns [dict get $tmpInfo xns]
}
set attrList {}
if {$options(useTypeNs) && [string equal $itemXns xs]} {
set itemXns $xns
}
if {$options(nsOnChangeOnly) && [string equal $itemXns $currentNs]} {
set itemXns {}
}
foreach key [dict keys $itemDef] {
if {[lsearch -exact $standardAttributes $key] == -1 && $key ne "isList" && $key ne "xns"} {
lappend attrList $key [dict get $itemDef $key]
::log::log debug "key = {$key} standardAttributes = {$standardAttributes}"
}
}
::log::log debug "\t\titemName = {$itemName} itemDef = {$itemDef} typeInfoList = {$typeInfoList} itemXns = {$itemXns} tmpInfo = {$tmpInfo} attrList = {$attrList}"
set isAbstract false
set baseType [string trimright $itemType {()?}]
if {$options(genOutAttr) && [dict exists $typeInfo $mode $service $baseType abstract]} {
set isAbstract [dict get $typeInfo $mode $service $baseType abstract]
}
::log::log debug "\t\titemName = {$itemName} itemDef = {$itemDef} typeInfoList = {$typeInfoList} isAbstract = {$isAbstract}"
# Strip the optional flag off the typeInfoList
set typeInfoList [lrange $typeInfoList 0 1]
switch -exact -- $typeInfoList {
{0 0} {
##
## Simple non-array
##
if {[string equal $itemXns $options(suppressNS)] || [string equal $itemXns {}]} {
$parent appendChild [$doc createElement $itemName retNode]
|
| ︙ | ︙ | |||
1933 1934 1935 1936 1937 1938 1939 |
}
}
{1 1} {
##
## Non-simple array
##
set dataList [dict get $dict $useName]
| < | 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 |
}
}
{1 1} {
##
## Non-simple array
##
set dataList [dict get $dict $useName]
#::log::log debug "\t\t [llength $dataList] rows {$dataList}"
foreach row $dataList {
if {[string equal $itemXns $options(suppressNS)] || [string equal $itemXns {}]} {
$parent appendChild [$doc createElement $itemName retNode]
} else {
$parent appendChild [$doc createElement $itemXns:$itemName retNode]
}
|
| ︙ | ︙ | |||
1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 |
} else {
lappend attrList $attr [dict get $row $attr]
}
}
} else {
set resultValue $row
}
if {![string equal $currentNs $itemXns] && ![string equal $itemXns {}]} {
set tmpNs $currentNs
set currentNs $itemXns
convertDictToType $mode $service $doc $retNode $resultValue $tmpType
} else {
convertDictToType $mode $service $doc $retNode $resultValue $tmpType
}
| > > > > > | 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 |
} else {
lappend attrList $attr [dict get $row $attr]
}
}
} else {
set resultValue $row
}
if {[string index $itemType end] eq {?}} {
set tmpType "[string trimright $itemType {()?}]?"
} else {
set tmpType [string trimright $itemType {()}]
}
if {![string equal $currentNs $itemXns] && ![string equal $itemXns {}]} {
set tmpNs $currentNs
set currentNs $itemXns
convertDictToType $mode $service $doc $retNode $resultValue $tmpType
} else {
convertDictToType $mode $service $doc $retNode $resultValue $tmpType
}
|
| ︙ | ︙ | |||
1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 |
# }
#}
}
set currentNs $entryNs
::log::log debug "Leaving ::WS::Utils::convertDictToType with xml: [$parent asXML]"
return;
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 |
# }
#}
}
set currentNs $entryNs
::log::log debug "Leaving ::WS::Utils::convertDictToType with xml: [$parent asXML]"
return;
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
#
# Procedure Name : ::WS::Utils::convertDictToJson
#
# Description : Convert a dictionary object into a JSON tree.
#
# Arguments :
# mode - The mode, Client or Server
# service - The service name the type is defined in
# doc - The document (yajltcl)
# dict - The dictionary to convert
# type - The name of the type
#
# Returns : None
#
# Side-Effects : None
#
# Exception Conditions : None
#
# Pre-requisite Conditions : None
#
# Original Author : Jeff Lawson
#
#>>END PRIVATE<<
#
# 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 03/23/2011 J.Lawson Initial version
#
#
###########################################################################
proc ::WS::Utils::convertDictToJson {mode service doc dict type} {
::log::log debug "Entering ::WS::Utils::convertDictToJson $mode $service $doc {$dict} $type"
variable typeInfo
variable simpleTypes
variable simpleTypesJson
variable options
variable standardAttributes
array set serviceData $::WS::Server::serviceArr($service)
set typeInfoList [TypeInfo $mode $service $type]
set type [string trimright $type {?}]
if {[dict exists $typeInfo $mode $service $service:$type]} {
set typeName $service:$type
} else {
set typeName $type
}
set itemList {}
if {[lindex $typeInfoList 0] && [dict exists $typeInfo $mode $service $typeName definition]} {
set itemList [dict get $typeInfo $mode $service $typeName definition]
set xns [dict get $typeInfo $mode $service $typeName xns]
} else {
set xns $simpleTypes($mode,$service,$typeName)
set itemList [list $typeName {type string}]
}
if {[info exists mutableTypeInfo([list $mode $service $typeName])]} {
set typeName [(*)[lindex mutableTypeInfo([list $mode $service $type]) 0] $mode $service $type $xns $dict]
set typeInfoList [TypeInfo $mode $service $typeName]
if {[lindex $typeInfoList 0]} {
set itemList [dict get $typeInfo $mode $service $typeName definition]
} else {
set itemList [list $type {type string}]
}
}
::log::log debug "\titemList is {$itemList}"
set fieldList {}
foreach {itemName itemDef} $itemList {
lappend fieldList $itemName
set itemType [dict get $itemDef type]
::log::log debug "\t\titemName = {$itemName} itemDef = {$itemDef} itemType = {$itemType}"
set typeInfoList [TypeInfo $mode $service $itemType 1]
if {![dict exists $dict $itemName]} {
if {$serviceData(-enforceRequired) && ![lindex $typeInfoList 2]} {
error "Required field $itemName is missing from response"
}
continue
}
if {[info exists simpleTypesJson([string trimright $itemType {()?}])]} {
set yajlType $simpleTypesJson([string trimright $itemType {()?}])
} else {
set yajlType "string"
}
::log::log debug "\t\titemName = {$itemName} itemDef = {$itemDef} typeInfoList = {$typeInfoList}"
set typeInfoList [lrange $typeInfoList 0 1]
switch $typeInfoList {
{0 0} {
##
## Simple non-array
##
set resultValue [dict get $dict $itemName]
$doc string $itemName $yajlType $resultValue
}
{0 1} {
##
## Simple array
##
set dataList [dict get $dict $itemName]
$doc string $itemName array_open
foreach row $dataList {
$doc $yajlType $row
}
$doc array_close
}
{1 0} {
##
## Non-simple non-array
##
$doc string $itemName map_open
set resultValue [dict get $dict $itemName]
convertDictToJson $mode $service $doc $resultValue $itemType
$doc map_close
}
{1 1} {
##
## Non-simple array
##
set dataList [dict get $dict $itemName]
$doc string $itemName array_open
if {[string index $itemType end] eq {?}} {
set tmpType "[string trimright $itemType {()?}]?"
} else {
set tmpType [string trimright $itemType {()}]
}
foreach row $dataList {
$doc map_open
convertDictToJson $mode $service $doc $row $tmpType
$doc map_close
}
$doc array_close
}
}
}
return;
}
###########################################################################
#
# Private Procedure Header - as this procedure is modified, please be sure
# that you update this header block. Thanks.
#
#>>BEGIN PRIVATE<<
|
| ︙ | ︙ | |||
2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 |
::log::log debug "Entering ::WS::Utils::convertDictToTypeNoNs $mode $service $doc $parent {$dict} $type"
# ::log::log debug " Parent xml: [$parent asXML]"
variable typeInfo
variable simpleTypes
variable options
variable standardAttributes
if {$options(valueAttrCompatiblityMode)} {
set valueAttr {}
} else {
set valueAttr {::value}
}
set typeInfoList [TypeInfo $mode $service $type]
if {[lindex $typeInfoList 0]} {
| > | 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 |
::log::log debug "Entering ::WS::Utils::convertDictToTypeNoNs $mode $service $doc $parent {$dict} $type"
# ::log::log debug " Parent xml: [$parent asXML]"
variable typeInfo
variable simpleTypes
variable options
variable standardAttributes
array set serviceData $::WS::Server::serviceArr($service)
if {$options(valueAttrCompatiblityMode)} {
set valueAttr {}
} else {
set valueAttr {::value}
}
set typeInfoList [TypeInfo $mode $service $type]
if {[lindex $typeInfoList 0]} {
|
| ︙ | ︙ | |||
2065 2066 2067 2068 2069 2070 2071 |
set itemList [list $type {type string}]
}
::log::log debug "\titemList is {$itemList}"
foreach {itemName itemDef} $itemList {
::log::log debug "\t\titemName = {$itemName} itemDef = {$itemDef}"
set itemType [dict get $itemDef type]
set isAbstract false
| | | > > > > | 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 |
set itemList [list $type {type string}]
}
::log::log debug "\titemList is {$itemList}"
foreach {itemName itemDef} $itemList {
::log::log debug "\t\titemName = {$itemName} itemDef = {$itemDef}"
set itemType [dict get $itemDef type]
set isAbstract false
set baseType [string trimright $itemType {()?}]
if {$options(genOutAttr) && [dict exists $typeInfo $mode $service $baseType abstract]} {
set isAbstract [dict get $typeInfo $mode $service $baseType abstract]
}
set typeInfoList [TypeInfo $mode $service $itemType 1]
if {![dict exists $dict $itemName]} {
if {$serviceData(-enforceRequired) && ![lindex $typeInfoList 2]} {
error "Required field $itemName is missing from response"
}
continue
}
set attrList {}
foreach key [dict keys $itemDef] {
if {[lsearch -exact $standardAttributes $key] == -1 && $key ne "isList" && $key ne "xns"} {
lappend attrList $key [dict get $itemDef $key]
::log::log debug "key = {$key} standardAttributes = {$standardAttributes}"
}
}
::log::log debug "\t\titemName = {$itemName} itemDef = {$itemDef} typeInfoList = {$typeInfoList}"
set typeInfoList [lrange $typeInfoList 0 1]
switch -exact -- $typeInfoList {
{0 0} {
##
## Simple non-array
##
$parent appendChild [$doc createElement $itemName retNode]
if {$options(genOutAttr)} {
|
| ︙ | ︙ | |||
2174 2175 2176 2177 2178 2179 2180 |
convertDictToTypeNoNs $mode $service $doc $retnode $resultValue $itemType
}
{1 1} {
##
## Non-simple array
##
set dataList [dict get $dict $itemName]
| | | 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 |
convertDictToTypeNoNs $mode $service $doc $retnode $resultValue $itemType
}
{1 1} {
##
## Non-simple array
##
set dataList [dict get $dict $itemName]
set tmpType [string trimright $itemType {()}]
foreach row $dataList {
$parent appendChild [$doc createElement $itemName retnode]
if {$options(genOutAttr)} {
set dictList [dict keys $row]
set resultValue {}
foreach attr [lindex [::struct::set intersect3 $standardAttributes $dictList] end] {
if {$isAbstract && [string equal $attr {::type}]} {
|
| ︙ | ︙ | |||
2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 |
::log::log debug "Entering ::WS::Utils::convertDictToEncodedType $mode $service $doc $parent {$dict} $type"
variable typeInfo
variable options
set typeInfoList [TypeInfo $mode $service $type]
::log::log debug "\t typeInfoList = {$typeInfoList}"
if {[lindex $typeInfoList 0]} {
set itemList [dict get $typeInfo $mode $service $type definition]
set xns [dict get $typeInfo $mode $service $type xns]
} else {
if {[info exists simpleTypes($mode,$service,$type)]} {
set xns [dict get $simpleTypes($mode,$service,$type) xns]
} else {
| > | 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 |
::log::log debug "Entering ::WS::Utils::convertDictToEncodedType $mode $service $doc $parent {$dict} $type"
variable typeInfo
variable options
set typeInfoList [TypeInfo $mode $service $type]
::log::log debug "\t typeInfoList = {$typeInfoList}"
set type [string trimright $type {?}]
if {[lindex $typeInfoList 0]} {
set itemList [dict get $typeInfo $mode $service $type definition]
set xns [dict get $typeInfo $mode $service $type xns]
} else {
if {[info exists simpleTypes($mode,$service,$type)]} {
set xns [dict get $simpleTypes($mode,$service,$type) xns]
} else {
|
| ︙ | ︙ | |||
2291 2292 2293 2294 2295 2296 2297 |
error "Simple type cannot be found: $type"
}
set itemList [list $type {type string}]
}
}
::log::log debug "\titemList is {$itemList} in $xns"
foreach {itemName itemDef} $itemList {
| | | 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 |
error "Simple type cannot be found: $type"
}
set itemList [list $type {type string}]
}
}
::log::log debug "\titemList is {$itemList} in $xns"
foreach {itemName itemDef} $itemList {
set itemType [string trimright [dict get $itemList $itemName type] {?}]
set typeInfoList [TypeInfo $mode $service $itemType]
::log::log debug "\t\t Looking for {$itemName} in {$dict}"
if {![dict exists $dict $itemName]} {
::log::log debug "\t\t Not found, skipping"
continue
}
::log::log debug "\t\t Type info is {$typeInfoList}"
|
| ︙ | ︙ | |||
2367 2368 2369 2370 2371 2372 2373 |
set dataList [dict get $dict $itemName]
set tmpType [string trimright $itemType {()}]
if {![string match {*:*} $itemType]} {
set attrType $xns:$itemType
} else {
set attrType $itemType
}
| | | 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 |
set dataList [dict get $dict $itemName]
set tmpType [string trimright $itemType {()}]
if {![string match {*:*} $itemType]} {
set attrType $xns:$itemType
} else {
set attrType $itemType
}
set attrType [string trim $attrType {()?}]
$parent setAttribute xmlns:soapenc {http://schemas.xmlsoap.org/soap/encoding/}
$parent setAttribute soapenc:arrayType [format {%s[%d]} $attrType [llength $dataList]]
$parent setAttribute xsi:type soapenc:Array
#set itemName [$parent nodeName]
foreach item $dataList {
if {[string equal $xns $options(suppressNS)]} {
$parent appendChild [$doc createElement $itemName retNode]
|
| ︙ | ︙ | |||
2669 2670 2671 2672 2673 2674 2675 |
warning {
set ::WS::Utils::targetNs $tmpTargetNs
::log::log $options(StrictMode) "Found $lastUnknownRefCount forward type references: [join [array names unkownRef] {,}]"
}
error -
default {
set ::WS::Utils::targetNs $tmpTargetNs
| < | 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 |
warning {
set ::WS::Utils::targetNs $tmpTargetNs
::log::log $options(StrictMode) "Found $lastUnknownRefCount forward type references: [join [array names unkownRef] {,}]"
}
error -
default {
set ::WS::Utils::targetNs $tmpTargetNs
return \
-code error \
-errorcode [list WS $mode UNKREFS [list $lastUnknownRefCount]] \
"Found $lastUnknownRefCount forward type references: [join [array names unkownRef] {,}]"
}
}
}
|
| ︙ | ︙ | |||
2910 2911 2912 2913 2914 2915 2916 |
-code error \
-errorcode [list WS CLIENT MISSCHLOC $baseUrl] \
"Missing Schema Location in '$baseUrl'"
}
}
set urlTail [$importNode getAttribute $attrName]
set url [::uri::resolve $baseUrl $urlTail]
| | | 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 |
-code error \
-errorcode [list WS CLIENT MISSCHLOC $baseUrl] \
"Missing Schema Location in '$baseUrl'"
}
}
set urlTail [$importNode getAttribute $attrName]
set url [::uri::resolve $baseUrl $urlTail]
::log::log debug "Including $url"
set lastPos [string last / $url]
set testUrl [string range $url 0 [expr {$lastPos - 1}]]
if { [info exists ::WS::Utils::redirectArray($testUrl)] } {
set newUrl $::WS::Utils::redirectArray($testUrl)
append newUrl [string range $url $lastPos end]
::log::log debug "newUrl = $newUrl"
|
| ︙ | ︙ | |||
3129 3130 3131 3132 3133 3134 3135 |
return \
-code error \
-errorcode [list WS $mode UNKREF [list $typeName $partType]] \
"Unknown forward type reference {$partType} in {$typeName}"
}
} else {
set partName [$middleNode getAttribute name]
| | | 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 |
return \
-code error \
-errorcode [list WS $mode UNKREF [list $typeName $partType]] \
"Unknown forward type reference {$partType} in {$typeName}"
}
} else {
set partName [$middleNode getAttribute name]
set partType [string trimright [getQualifiedType $results [$middleNode getAttribute type string:string] $tns] {?}]
set partMax [$middleNode getAttribute maxOccurs 1]
if {$partMax <= 1} {
lappend partList $partName [list type $partType comment $comment]
} else {
lappend partList $partName [list type [string trimright ${partType} {()}]() comment $comment]
}
}
|
| ︙ | ︙ | |||
3196 3197 3198 3199 3200 3201 3202 |
set ref $attr
}
catch {set attrArr($name) [$element getAttribute $ref]}
}
set partName item
set partType [getQualifiedType $results $attrArr(arrayType) $tns]
set partType [string map {{[]} {()}} $partType]
| | | 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 |
set ref $attr
}
catch {set attrArr($name) [$element getAttribute $ref]}
}
set partName item
set partType [getQualifiedType $results $attrArr(arrayType) $tns]
set partType [string map {{[]} {()}} $partType]
lappend partList $partName [list type [string trimright ${partType} {()?}]() comment $comment allowAny 1]
set nodeFound 1
}
extension {
::log::log debug "Calling partList for $contentType of $typeName"
if {[catch {set tmp [partList $mode $child $serviceName results $tns]} msg]} {
::log::log debug "Error in partList {$msg}, errorInfo: $errorInfo"
}
|
| ︙ | ︙ | |||
3325 3326 3327 3328 3329 3330 3331 |
##
## Do Nothing
##
}
element {
catch {
set partName [$node getAttribute name]
| | | 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 |
##
## Do Nothing
##
}
element {
catch {
set partName [$node getAttribute name]
set partType [string trimright [getQualifiedType $results [$node getAttribute type string] $tns] {?}]
set partMax [$node getAttribute maxOccurs 1]
if {$partMax <= 1} {
set partList [list $partName [list type $partType comment {}]]
} else {
set partList [list $partName [list type [string trimright ${partType} {()}]() comment {}]]
}
}
|
| ︙ | ︙ | |||
3401 3402 3403 3404 3405 3406 3407 |
set attrName ref
set isRef 1
}
set partName [$element getAttribute $attrName]
if {$isRef} {
set partType {}
set partTypeInfo {}
| | | 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 |
set attrName ref
set isRef 1
}
set partName [$element getAttribute $attrName]
if {$isRef} {
set partType {}
set partTypeInfo {}
set partType [string trimright [getQualifiedType $results $partName $tns] {?}]
set partTypeInfo [::WS::Utils::GetServiceTypeDef $mode $serviceName $partType]
set partName [lindex [split $partName {:}] end]
::log::log debug "\t\t\t part name is {$partName} type is {$partTypeInfo}"
if {[dict exists $partTypeInfo definition $partName]} {
set partType [dict get $partTypeInfo definition $partName type]
}
::log::log debug "\t\t\t part name is {$partName} type is {$partType}"
|
| ︙ | ︙ | |||
3450 3451 3452 3453 3454 3455 3456 |
}
} else {
set partMax [$element getAttribute maxOccurs 1]
}
if {$partMax <= 1} {
lappend partList $partName [concat [list type $partType comment $comment] $additional_defininition_elements]
} else {
| | | 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 |
}
} else {
set partMax [$element getAttribute maxOccurs 1]
}
if {$partMax <= 1} {
lappend partList $partName [concat [list type $partType comment $comment] $additional_defininition_elements]
} else {
lappend partList $partName [concat [list type [string trimright ${partType} {()?}]() comment $comment] $additional_defininition_elements]
}
} msg]} {
::log::log error "\tError processing {$msg} for [$element asXML]"
if {$isRef} {
::log::log error "\t\t Was a reference. Additionally information is:"
::log::log error "\t\t\t part name is {$partName} type is {$partType} with {$partTypeInfo}"
}
|
| ︙ | ︙ | |||
3486 3487 3488 3489 3490 3491 3492 |
set ref $attr
}
catch {set attrArr($name) [$element getAttribute $ref]}
}
set partName item
set partType [getQualifiedType $results $attrArr(arrayType) $tns]
set partType [string map {{[]} {()}} $partType]
| | | 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 |
set ref $attr
}
catch {set attrArr($name) [$element getAttribute $ref]}
}
set partName item
set partType [getQualifiedType $results $attrArr(arrayType) $tns]
set partType [string map {{[]} {()}} $partType]
set partList [list $partName [list type [string trimright ${partType} {()?}]() comment {} allowAny 1]]
}
extension {
set extension [$node selectNodes -namespaces $nsList xs:extension]
set partList [partList $mode $extension $serviceName results $tns]
}
default {
##
|
| ︙ | ︙ | |||
3679 3680 3681 3682 3683 3684 3685 |
if {[string equal $partMax -1]} {
set partMax [[$element parent] getAttribute maxOccurs -1]
}
if {$partMax <= 1} {
lappend partList $partName [list type $partType comment {}]
} else {
| | | 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 |
if {[string equal $partMax -1]} {
set partMax [[$element parent] getAttribute maxOccurs -1]
}
if {$partMax <= 1} {
lappend partList $partName [list type $partType comment {}]
} else {
lappend partList $partName [list type [string trimright ${partType} {()?}]() comment {}]
}
}
if {[llength $elements] == 0} {
#
# Validate this is not really a complex or simple type
#
set childList [$node childNodes]
|
| ︙ | ︙ | |||
3732 3733 3734 3735 3736 3737 3738 |
if {([lindex [TypeInfo $mode $serviceName $partType] 0] == 0) &&
[string equal $tns:$typeName $partType]} {
return
} else {
lappend partList $typeName [list type $partType comment {}]
}
} else {
| | | 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 |
if {([lindex [TypeInfo $mode $serviceName $partType] 0] == 0) &&
[string equal $tns:$typeName $partType]} {
return
} else {
lappend partList $typeName [list type $partType comment {}]
}
} else {
lappend partList $typeName [list type [string trimright ${partType} {()?}]() comment {}]
}
}
if {[llength $partList]} {
::WS::Utils::ServiceTypeDef $mode $serviceName $tns:$typeName $partList $tns $isAbstractType
} else {
if {![dict exists $results types $tns:$typeName]} {
set partList [list base string comment {} xns $tns]
|
| ︙ | ︙ | |||
3909 3910 3911 3912 3913 3914 3915 |
##
set result 1
##
## Get the type information
##
set typeInfoList [TypeInfo $mode $serviceName $typeName]
| | > | 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 |
##
set result 1
##
## Get the type information
##
set typeInfoList [TypeInfo $mode $serviceName $typeName]
set baseTypeName [string trimright $typeName {()?}]
set typeName [string trimright $typeName {?}]
set typeInfo [GetServiceTypeDef $mode $serviceName $baseTypeName]
set isComplex [lindex $typeInfoList 0]
set isArray [lindex $typeInfoList 1]
if {$isComplex} {
##
## Is complex
|
| ︙ | ︙ | |||
4102 4103 4104 4105 4106 4107 4108 |
###########################################################################
proc ::WS::Utils::buildTags {mode serviceName typeName valueInfos doc currentNode} {
upvar 1 $valueInfos values
##
## Get the type information
##
| | > | | 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 |
###########################################################################
proc ::WS::Utils::buildTags {mode serviceName typeName valueInfos doc currentNode} {
upvar 1 $valueInfos values
##
## Get the type information
##
set baseTypeName [string trimright $typeName {()?}]
set typeInfo [GetServiceTypeDef $mode $serviceName $baseTypeName]
set typeName [string trimright $typeName {?}]
set xns [dict get $typeInfo $mode $service $type xns]
foreach {field fieldDef} [dict get $typeInfo definition] {
##
## Get info about this field and its type
##
array unset fieldInfoArr
set fieldInfoArr(minOccurs) 0
array set fieldInfoArr $fieldDef
set typeInfoList [TypeInfo $mode $serviceName $fieldInfoArr(type)]
set fieldBaseType [string trimright $fieldInfoArr(type) {()?}]
set isComplex [lindex $typeInfoList 0]
set isArray [lindex $typeInfoList 1]
if {[dict exists $valueInfos $field]} {
if {$isArray} {
set valueList [dict get $valueInfos $field]
} else {
set valueList [list [dict get $valueInfos $field]]
|
| ︙ | ︙ | |||
4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 |
set results {<** Circular Reference **>}
::log::log debug "Leaving [info level 0] with {$results}"
return $results
} else {
set generatedTypes([list $mode $serviceName $type]) 1
}
# set typeDefInfo [dict get $typeInfo $mode $serviceName $type]
set typeDefInfo [GetServiceTypeDef $mode $serviceName $type]
if {![llength $typeDefInfo]} {
## We failed to locate the type. try with the last known xns...
set typeDefInfo [GetServiceTypeDef $mode $serviceName ${xns}:$type]
}
| > | 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 |
set results {<** Circular Reference **>}
::log::log debug "Leaving [info level 0] with {$results}"
return $results
} else {
set generatedTypes([list $mode $serviceName $type]) 1
}
set type [string trimright $type {?}]
# set typeDefInfo [dict get $typeInfo $mode $serviceName $type]
set typeDefInfo [GetServiceTypeDef $mode $serviceName $type]
if {![llength $typeDefInfo]} {
## We failed to locate the type. try with the last known xns...
set typeDefInfo [GetServiceTypeDef $mode $serviceName ${xns}:$type]
}
|
| ︙ | ︙ | |||
4405 4406 4407 4408 4409 4410 4411 |
}
}
set typeDefInfo [dict create definition [dict create $type $typeDefInfo]]
}
set partsList [dict keys [dict get $typeDefInfo definition]]
::log::log debug "\t partsList is {$partsList}"
foreach partName $partsList {
| | | 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 |
}
}
set typeDefInfo [dict create definition [dict create $type $typeDefInfo]]
}
set partsList [dict keys [dict get $typeDefInfo definition]]
::log::log debug "\t partsList is {$partsList}"
foreach partName $partsList {
set partType [string trimright [dict get $typeDefInfo definition $partName type] {?}]
set partXns $xns
catch {set partXns [dict get $typeInfo $mode $serviceName $partType xns]}
set typeInfoList [TypeInfo $mode $serviceName $partType]
set isArray [lindex $typeInfoList end]
::log::log debug "\tpartName $partName partType $partType xns $xns typeInfoList $typeInfoList"
switch -exact -- $typeInfoList {
|
| ︙ | ︙ | |||
4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 |
set lastPos [string last / $initialUrl]
set initialUrlDir [string range $initialUrl 0 [expr {$lastPos - 1}]]
set lastPos [string last / $finalUrl]
set finalUrlDir [string range $finalUrl 0 [expr {$lastPos - 1}]]
::log::log debug "initialUrlDir = $initialUrlDir, finalUrlDir = $finalUrlDir"
set ::WS::Utils::redirectArray($initialUrlDir) $finalUrlDir
}
return $token
}
# http code announces redirect (3xx)
array set meta [set ${token}(meta)]
if {![info exist meta(Location)]} {
::log::log debug "Redirect http code without Location"
return $token
| > > | 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 |
set lastPos [string last / $initialUrl]
set initialUrlDir [string range $initialUrl 0 [expr {$lastPos - 1}]]
set lastPos [string last / $finalUrl]
set finalUrlDir [string range $finalUrl 0 [expr {$lastPos - 1}]]
::log::log debug "initialUrlDir = $initialUrlDir, finalUrlDir = $finalUrlDir"
set ::WS::Utils::redirectArray($initialUrlDir) $finalUrlDir
}
return $token
} elseif {![string match {20[1237]} $ncode]} {
return $token
}
# http code announces redirect (3xx)
array set meta [set ${token}(meta)]
if {![info exist meta(Location)]} {
::log::log debug "Redirect http code without Location"
return $token
|
| ︙ | ︙ |
Changes to Wub.tcl.
| ︙ | ︙ | |||
44 45 46 47 48 49 50 |
if {![llength [info command dict]]} {
package require dict
}
package require uri
package require base64
package require html
| | | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
if {![llength [info command dict]]} {
package require dict
}
package require uri
package require base64
package require html
package provide WS::Wub 2.4.0
namespace eval ::WS::Wub {
array set portInfo {}
set portList [list]
set forever {}
|
| ︙ | ︙ |
Changes to WubServer.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 |
# WSWub - Wub interface to WebServices
package require Tcl 8.4
# WS::Utils usable here for dict?
if {![llength [info command dict]]} {
package require dict
}
package require WS::Server
package require OO
package require Direct
package require Debug
Debug off wsdl 10
| | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 |
# WSWub - Wub interface to WebServices
package require Tcl 8.4
# WS::Utils usable here for dict?
if {![llength [info command dict]]} {
package require dict
}
package require WS::Server
package require OO
package require Direct
package require Debug
Debug off wsdl 10
package provide WS::Wub 2.4.0
package provide Wsdl 2.4.0
class create Wsdl {
method / {r args} {
return [Http Ok $r [::WS::Server::generateInfo $service 0] text/html]
}
method /op {r args} {
|
| ︙ | ︙ |
Changes to pkgIndex.tcl.
1 | # Tcl package index file, version 1.1 | | | | | < | | | < | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | # Tcl package index file, version 1.1 # This file is generated by the "pkg_mkIndex -direct" command # and sourced either when an application starts up or # by a "package unknown" script. It invokes the # "package ifneeded" command to set up package-related # information so that packages will be loaded automatically # in response to "package require" commands. When this # script is sourced, the variable $dir must contain the # full path name of this file's directory. package ifneeded WS::AOLserver 2.4.0 [list source [file join $dir AOLserver.tcl]] package ifneeded WS::Channel 2.4.0 [list source [file join $dir ChannelServer.tcl]] package ifneeded WS::Client 2.4.0 [list source [file join $dir ClientSide.tcl]] package ifneeded WS::Embeded 2.4.0 [list source [file join $dir Embedded.tcl]] package ifneeded WS::Server 2.4.0 [list source [file join $dir ServerSide.tcl]] package ifneeded WS::Utils 2.4.0 [list source [file join $dir Utilities.tcl]] package ifneeded WS::Wub 2.4.0 [list source [file join $dir WubServer.tcl]] package ifneeded Wsdl 2.4.0 [list source [file join $dir WubServer.tcl]] |