oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging donorware changes

Browse source
This commit is contained in:
JT Smith 2005-02-14 18:28:53 +00:00
parent 9d025d7c28
commit c3fa5f85bd
1 changed files with 48 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

56
lib/WebGUI/Asset/Wobject/WSClient.pm
View file

@ -41,6 +41,19 @@ BEGIN {
our @ISA = qw(WebGUI::Asset::Wobject);
#-------------------------------------------------------------------
sub _create_cache_key {
my ($wobject, $call, $param_str) = @_;
my $cache_key;
$cache_key = $_[0]->get('sharedCache')
? Digest::MD5::md5_hex($call, $param_str)
: Digest::MD5::md5_hex($call, $param_str, $session{'var'}{'sessionId'});
WebGUI::ErrorHandler::warn(($_[0]->get('sharedCache')?'shared':'session')
. " cache_key=$cache_key md5_hex($call, $param_str)");
return $cache_key;
}
#-------------------------------------------------------------------
sub definition {
my $class = shift;
@ -249,10 +262,13 @@ sub view {
$cache_key, # unique cache identifier
$cache, # cache object
$call, # SOAP method call
@exclude_params, # input params NOT to pass to next pg
$p, # pagination object
$param_str, # raw SOAP params before parsing
@params, # params to soap method call
@result, # SOAP result reference
@params, # params to soap method call
$query_string, # query string to pass thru to next pg
@result, # SOAP result reference
%seen, # counts diff bxt input & output params
$soap, # SOAP object
@targetWobjects, # list of non-default wobjects to exec
$url, # current page url
@ -262,6 +278,22 @@ sub view {
# this page, with important params
$url = $self->getUrl("func=view");
# This could belong up towards the top of the script, but it's nice to
# have it down right close to the impacted code. Add to this list params
# that should never, ever be passed across multiple results pages
@exclude_params = qw(cache func pn wid);
# this page, with important params
@seen{@exclude_params} = ();
for (keys %{$session{'form'}}) {
unless (exists $seen{$_}) {
$query_string .= WebGUI::URL::escape($_) . '='
. WebGUI::URL::escape($session{'form'}{$_}) . '&';
}
}
$url = WebGUI::URL::page($query_string);
# snag our SOAP call and preprocess if needed
if ($self->get('preprocessMacros')) {
$call = WebGUI::Macro::process($self->get("callMethod"));
@ -292,11 +324,19 @@ sub view {
# check to see if this exact query has already been cached, using either
# a cache specific to this session, or a shared global cache
$cache_key = $self->get('sharedCache')
? Digest::MD5::md5_hex($call, $param_str)
: Digest::MD5::md5_hex($call, $param_str, $session{'var'}{'sessionId'});
WebGUI::ErrorHandler::warn(($self->get('sharedCache')?'shared':'session')
. " cache_key=$cache_key md5_hex($call, $param_str)");
if ($session{'form'}{'cache'}) {
if ($session{'form'}{'targetWobjects'}
&& grep /^$call$/, @targetWobjects) {
$cache_key = $session{'form'}{'cache'};
WebGUI::ErrorHandler::warn("passed a cache_key for $call");
} else {
WebGUI::ErrorHandler::warn("cache_key not applicable to $call ");
$cache_key = _create_cache_key($self, $call, $param_str);
}
} else {
$cache_key = _create_cache_key($self, $call, $param_str);
}
$cache = WebGUI::Cache->new($cache_key,
WebGUI::International::get(4, "WSClient"));
@ -515,7 +555,7 @@ sub _instantiate_soap {
$soap = new SOAP::Lite
on_fault => sub {
my ($soap, $res) = @_;
die $res->faultstring;
die ref $res ? $res->faultstring : $soap->transport->status, "\n";
};
$soap->uri($self->get('uri'));