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

bug fixes

Browse source
This commit is contained in:
JT Smith 2009-09-25 22:50:59 -05:00
parent ccff9c7014
commit ebb6134c2d
27 changed files with 84 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/WebGUI/Asset/File.pm
View file

@ -447,7 +447,7 @@ Extends the master method to clear the view cache.
sub purgeCache {
my $self = shift;
$self->session->cache->delete("view_".$self->getId);
eval{$self->session->cache->delete("view_".$self->getId)};
$self->SUPER::purgeCache;
}
@ -607,7 +607,7 @@ Generate the view method for the Asset, and handle caching.
sub view {
my $self = shift;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
my $out = $self->session->cache->get("view_".$self->getId);
my $out = eval{$self->session->cache->get("view_".$self->getId)};
return $out if $out;
}
my %var = %{$self->get};
@ -617,7 +617,7 @@ sub view {
$var{fileSize} = formatBytes($self->get("assetSize"));
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
$self->session->cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"));
eval{$self->session->cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"))};
}
return $out;
}

4
lib/WebGUI/Asset/File/Image.pm
View file

@ -224,7 +224,7 @@ sub view {
my $self = shift;
my $cache = $self->session->cache;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
my $out = $cache->get("view_".$self->getId);
my $out = eval{$cache->get("view_".$self->getId)};
return $out if $out;
}
my %var = %{$self->get};
@ -248,7 +248,7 @@ sub view {
my $form = $self->session->form;
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"));
eval{$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"))};
}
return $out;
}

4
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -222,7 +222,7 @@ sub view {
my $self = shift;
my $cache = $self->session->cache;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
my $out = $cache->get("view_".$self->getId);
my $out = eval{$cache->get("view_".$self->getId)};
return $out if $out;
}
my %var = %{$self->get};
@ -245,7 +245,7 @@ sub view {
$var{noFileSpecified} = $i18n->get('noFileSpecified');
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"));
eval{$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"))};
}
return $out;
}

2
lib/WebGUI/Asset/Post.pm
View file

@ -1187,7 +1187,7 @@ Extend the base class to handle caching.
sub purgeCache {
my $self = shift;
$self->session->cache->delete("view_".$self->getThread->getId) if ($self->getThread);
eval{$self->session->cache->delete("view_".$self->getThread->getId)} if ($self->getThread);
$self->SUPER::purgeCache;
}

4
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -1027,7 +1027,7 @@ sub view {
$self->incrementViews unless ($self->session->form->process("func") eq 'rate');
my $cache = $self->session->cache;
if ($self->session->user->isVisitor && !$self->session->form->process("layout")) {
my $out = $cache->get("view_".$self->getId);
my $out = eval{$cache->get("view_".$self->getId)};
return $out if $out;
}
$self->session->scratch->set("discussionLayout",$self->session->form->process("layout")) if ($self->session->form->process("layout"));
@ -1134,7 +1134,7 @@ sub view {
my $out = $self->processTemplate($var,undef,$self->{_viewTemplate});
if ($self->session->user->isVisitor && !$self->session->form->process("layout")) {
$cache->set("view_".$self->getId, $out, $self->getThread->getParent->get("visitorCacheTimeout"));
eval{$cache->set("view_".$self->getId, $out, $self->getThread->getParent->get("visitorCacheTimeout"))};
}
return $out;
}

6
lib/WebGUI/Asset/Shortcut.pm
View file

@ -484,7 +484,7 @@ sub getOverrides {
my $cache = $session->cache;
my $u = WebGUI::User->new($self->session, $self->discernUserId);
my $overridesRef = $cache->get($self->_overridesCacheTag);
my $overridesRef = eval{$cache->get($self->_overridesCacheTag)};
##If admin mode is not on, and the cache is valid, and not expired, and the user object was not updated,
##return the cached value.
if ( ! $session->var->isAdminOn
@ -532,7 +532,7 @@ sub getOverrides {
}
}
$overrides{userLastUpdated} = $session->user->get('lastUpdated');
$cache->set($self->_overridesCacheTag, \%overrides, 60*60);
eval{$cache->set($self->_overridesCacheTag, \%overrides, 60*60)};
$overridesRef = \%overrides;
return %{ $overridesRef };
}
@ -879,7 +879,7 @@ Delete any cached overrides.
sub uncacheOverrides {
my $self = shift;
$self->session->cache->delete($self->_overridesCacheTag);
eval{$self->session->cache->delete($self->_overridesCacheTag)};
}
#-------------------------------------------------------------------

8
lib/WebGUI/Asset/Snippet.pm
View file

@ -251,8 +251,10 @@ Extending purgeCache to handle caching of the rendered snippet
sub purgeCache {
my $self = shift;
my $self->session->cache;
$cache->delete("view__".$self->getId);
$cache->delete("view_1_".$self->getId);
eval {
$cache->delete("view__".$self->getId);
$cache->delete("view_1_".$self->getId);
};
$self->SUPER::purgeCache();
}
@ -292,7 +294,7 @@ sub view {
}
WebGUI::Macro::process($session,\$output);
unless ($noCache) {
$session->cache->set("view_".$calledAsWebMethod."_".$self->getId, $output, $self->get("cacheTimeout"));
eval{$session->cache->set("view_".$calledAsWebMethod."_".$self->getId, $output, $self->get("cacheTimeout"))};
}
return $output;
}

6
lib/WebGUI/Asset/Wobject/Article.pm
View file

@ -318,7 +318,7 @@ See WebGUI::Asset::purgeCache() for details.
sub purgeCache {
my $self = shift;
$self->session->cache->delete("view_".$self->getId);
eval{$self->session->cache->delete("view_".$self->getId)};
$self->SUPER::purgeCache;
}
@ -350,7 +350,7 @@ sub view {
my $cache = $self->session->cache;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10 && !$self->session->form->process("overrideTemplateId") &&
!$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) {
my $out = $cache->get("view_".$self->getId);
my $out = eval{$cache->get("view_".$self->getId)};
return $out if $out;
}
my %var;
@ -414,7 +414,7 @@ sub view {
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10 && !$self->session->form->process("overrideTemplateId") &&
!$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) {
$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"));
eval{$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"))};
}
return $out;
}

10
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -1404,8 +1404,10 @@ Extend the base method to delete view and visitor caches.
sub purgeCache {
my $self = shift;
my $cache = $self->session->cache;
$cache->delete("view_".$self->getId);
$cache->delete($self->_visitorCacheKey);
eval {
$cache->delete("view_".$self->getId);
$cache->delete($self->_visitorCacheKey);
};
$self->next::method;
}
@ -1551,7 +1553,7 @@ sub view {
my $self = shift;
my $cache = $self->session->cache;
if ($self->_visitorCacheOk) {
my $out = $cache->get($self->_visitorCacheKey);
my $out = eval{$cache->get($self->_visitorCacheKey)};
$self->session->errorHandler->debug("HIT") if $out;
return $out if $out;
}
@ -1562,7 +1564,7 @@ sub view {
$self->prepareView unless ($self->{_viewTemplate});
my $out = $self->processTemplate($self->getViewTemplateVars,undef,$self->{_viewTemplate});
if ($self->_visitorCacheOk) {
$cache->set($self->_visitorCacheKey, $out, $self->get("visitorCacheTimeout"));
eval{$cache->set($self->_visitorCacheKey, $out, $self->get("visitorCacheTimeout"))};
}
return $out;
}

6
lib/WebGUI/Asset/Wobject/Folder.pm
View file

@ -207,7 +207,7 @@ See WebGUI::Asset::purgeCache() for details.
sub purgeCache {
my $self = shift;
$self->session->cache->delete("view_".$self->getId);
eval{$self->session->cache->delete("view_".$self->getId)};
$self->SUPER::purgeCache;
}
@ -226,7 +226,7 @@ sub view {
# Use cached version for visitors
my $cache = $self->session->cache;
if ($self->session->user->isVisitor) {
my $out = $cache->get("view_".$self->getId);
my $out = eval{$cache->get("view_".$self->getId)};
return $out if $out;
}
@ -291,7 +291,7 @@ sub view {
# Update the cache
if ($self->session->user->isVisitor) {
$cache->set("view_".$self->getId, $out, $self->get("visitorCacheTimeout"));
eval{$cache->set("view_".$self->getId, $out, $self->get("visitorCacheTimeout"))};
}
return $out;

21
lib/WebGUI/Asset/Wobject/HttpProxy.pm
View file

@ -277,8 +277,10 @@ See WebGUI::Asset::purgeCache() for details.
sub purgeCache {
my $self = shift;
my $cache = $self->session->cache;
$cache->delete([$self->get("proxiedUrl"),"URL"]);
$cache->delete([$self->get("proxiedUrl"),"HEADER"]);
eval {
$cache->delete([$self->get("proxiedUrl"),"URL"]);
$cache->delete([$self->get("proxiedUrl"),"HEADER"]);
};
$self->SUPER::purgeCache;
}
@ -321,10 +323,11 @@ sub view {
### Do we have cached content to get?
my $cache = $self->session->cache;
if ($requestMethod =~ /^GET$/i)
{
$var{header} = $cache->get([$proxiedUrl,'HEADER']);
$var{content} = $cache->get([$proxiedUrl,"URL"]);
if ($requestMethod =~ /^GET$/i) {
eval {
$var{header} = $cache->get([$proxiedUrl,'HEADER']);
$var{content} = $cache->get([$proxiedUrl,"URL"]);
};
}
# Unless we have cached content
@ -464,8 +467,10 @@ sub view {
$var{content} = sprintf $i18n->get('fetch page error'), $proxiedUrl, $proxiedUrl, $response->status_line;
}
unless ($self->get("cacheTimeout") <= 10) {
$cache->set([$proxiedUrl,'URL'], $var{content}, $self->get("cacheTimeout"));
$cache->set([$proxiedUrl,'HEADER'], $var{header}, $self->get("cacheTimeout"));
eval{
$cache->set([$proxiedUrl,'URL'], $var{content}, $self->get("cacheTimeout"));
$cache->set([$proxiedUrl,'HEADER'], $var{header}, $self->get("cacheTimeout"));
};
}
}

4
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -413,12 +413,12 @@ sub www_view {
$cacheKey .= '_ssl';
}
my $cache = $session->cache;
my $out = $cache->get($cacheKey);
my $out = eval{$cache->get($cacheKey)};
unless ($out) {
$self->prepareView;
$session->stow->set("cacheFixOverride", 1);
$out = $self->processStyle($self->view, { noHeadTags => 1 });
$cache->set($cacheKey, $out, 60);
eval{$cache->set($cacheKey, $out, 60)};
$session->stow->delete("cacheFixOverride");
}
# keep those ads rotating even though the output is cached

8
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -507,7 +507,7 @@ sub getListings {
|| ($versionTag && $versionTag->getId eq $self->get("tagId"));
my $cache = $session->cache;
unless ($noCache) {
$listingsEncoded = $cache->get("matrixListings_".$self->getId);
$listingsEncoded = eval{$cache->get("matrixListings_".$self->getId)};
}
if ($listingsEncoded){
@ -547,7 +547,7 @@ assetData.revisionDate
}
$listingsEncoded = JSON->new->encode($listings);
$cache->set("matrixListings_".$self->getId, $listingsEncoded, $self->get("listingsCacheTimeout"));
eval{$cache->set("matrixListings_".$self->getId, $listingsEncoded, $self->get("listingsCacheTimeout"))};
}
return $listings;
}
@ -688,7 +688,7 @@ sub view {
|| ($versionTag && $versionTag->getId eq $self->get("tagId"));
my $cache = $session->cache;
unless ($noCache) {
$varStatisticsEncoded = $cache->get("matrixStatistics_".$self->getId);
$varStatisticsEncoded = eval{$cache->get("matrixStatistics_".$self->getId)};
}
if ($varStatisticsEncoded){
@ -837,7 +837,7 @@ sub view {
[$self->getId]);
$varStatisticsEncoded = JSON->new->encode($varStatistics);
$cache->set("matrixStatistics_".$self->getId, $varStatisticsEncoded, $self->get("statisticsCacheTimeout"));
eval{$cache->set("matrixStatistics_".$self->getId, $varStatisticsEncoded, $self->get("statisticsCacheTimeout"))};
}
foreach my $statistic (keys %{$varStatistics}) {

6
lib/WebGUI/Asset/Wobject/MessageBoard.pm
View file

@ -90,7 +90,7 @@ See WebGUI::Asset::purgeCache() for details.
sub purgeCache {
my $self = shift;
$self->session->cache->delete("view_".$self->getId);
eval{$self->session->cache->delete("view_".$self->getId)};
$self->SUPER::purgeCache;
}
@ -106,7 +106,7 @@ sub view {
my $self = shift;
my $cache = $self->session->cache;
if ($self->session->user->isVisitor) {
my $out = $cache->get("view_".$self->getId);
my $out = eval{$cache->get("view_".$self->getId)};
return $out if $out;
}
my %var;
@ -171,7 +171,7 @@ sub view {
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if ($self->session->user->isVisitor) {
$cache->set("view_".$self->getId, $out, $self->get("visitorCacheTimeout"));
eval{$cache->set("view_".$self->getId, $out, $self->get("visitorCacheTimeout"))};
}
return $out;
}

6
lib/WebGUI/Asset/Wobject/MultiSearch.pm
View file

@ -113,7 +113,7 @@ See WebGUI::Asset::purgeCache() for details.
sub purgeCache {
my $self = shift;
$self->session->cache->delete("view_".$self->getId);
eval{$self->session->cache->delete("view_".$self->getId)};
$self->SUPER::purgeCache;
}
@ -130,7 +130,7 @@ sub view {
my $self = shift;
my $cache = $self->session->cache;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
my $out = $cache->get("view_".$self->getId);
my $out = eval{$cache->get("view_".$self->getId)};
return $out if $out;
}
my $i18n = WebGUI::International->new($self->session, 'Asset_MultiSearch');
@ -143,7 +143,7 @@ sub view {
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"));
eval{$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"))};
}
return $out;
}

6
lib/WebGUI/Asset/Wobject/SQLReport.pm
View file

@ -517,7 +517,7 @@ See WebGUI::Asset::purgeCache() for details.
sub purgeCache {
my $self = shift;
$self->session->cache->delete("view_".$self->getId);
eval{$self->session->cache->delete("view_".$self->getId)};
$self->SUPER::purgeCache;
}
@ -534,7 +534,7 @@ sub view {
my $self = shift;
my $cache = $self->session->cache;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
my $out = $cache->get("view_".$self->getId);
my $out = eval{$cache->get("view_".$self->getId)};
return $out if $out;
}
# Initiate an empty debug loop
@ -560,7 +560,7 @@ sub view {
my $out = $self->processTemplate($var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"));
eval{$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"))};
}
return $out;
}

10
lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
View file

@ -142,9 +142,9 @@ sub generateFeed {
if ($self->get('processMacroInRssUrl')) {
WebGUI::Macro::process($self->session, \$url);
}
my $value = $cache->get($url);
my $value = eval{$cache->get($url)};
unless ($value) {
$value = $cache->setByHttp($url, $url, $self->get("cacheTimeout"));
$value = eval{$cache->setByHttp($url, $url, $self->get("cacheTimeout"))};
$newlyCached = 1;
}
# if the content can be downgraded, it is either valid latin1 or didn't have
@ -327,7 +327,7 @@ See WebGUI::Asset::purgeCache() for details.
sub purgeCache {
my $self = shift;
$self->session->cache->delete("view_".$self->getId);
eval{$self->session->cache->delete("view_".$self->getId)};
$self->next::method;
}
@ -345,7 +345,7 @@ sub view {
# try the cached version
my $cache = $session->cache;
my $out = $cache->get("view_".$self->getId);
my $out = eval{$cache->get("view_".$self->getId)};
return $out if ($out ne "" && !$session->var->isAdminOn);
#return $out if $out;
@ -353,7 +353,7 @@ sub view {
my $feed = $self->generateFeed;
$out = $self->processTemplate($self->getTemplateVariables($feed),undef,$self->{_viewTemplate});
if (!$session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"));
eval{$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"))};
}
return $out;
}

4
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -2662,7 +2662,7 @@ sub www_export {
push(@fieldLabels,@metaDataFields)
}
$query = $session->cache->get("query_".$thingId);
$query = eval{$session->cache->get("query_".$thingId)};
$sth = $session->db->read($query);
### Loop through the returned structure and put it through Text::CSV
@ -3307,7 +3307,7 @@ sequenceNumber');
}
# store query in cache for thirty minutes
$self->session->cache->set("query_".$thingId, $query, 30*60);
eval{$self->session->cache->set("query_".$thingId, $query, 30*60)};
$paginatePage = $self->session->form->param('pn') || 1;
$currentUrl = $self->session->url->append($currentUrl, "orderBy=".$orderBy) if $orderBy;