| '.$WebGUI::VERSION.'-'.$WebGUI::STATUS.' |
';
if ($version ne $WebGUI::VERSION) {
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 10dc97c4b..65c85f7da 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -15,7 +15,10 @@ package WebGUI::Session;
=cut
use strict;
-use WebGUI::Cache;
+use 5.010;
+
+use CHI;
+use File::Temp qw( tempdir );
use WebGUI::Config;
use WebGUI::SQL;
use WebGUI::User;
@@ -111,22 +114,44 @@ sub asset {
=head2 cache ( )
-Returns a WebGUI::Cache object, which is connected to the WebGUI memcached server.
+Returns a CHI object, configured according to the settings in the config file.
=cut
sub cache {
- my $self = shift;
- unless (exists $self->{_cache}) {
- my $cache = WebGUI::Cache->new($self);
- if (defined $cache) {
- $self->{_cache} = $cache;
- }
- else {
- $self->log->fatal("Couldn't connect to WebGUI memcached server, and can't continue without it.");
- }
- }
- return $self->{_cache};
+ my $self = shift;
+ unless (exists $self->{_cache}) {
+ my $cacheConf = $self->config->get('cache');
+
+ # Default values
+ my $resolveConf = sub {
+ my ($config) = @_;
+ given ( $config->{driver} ) {
+ when ( /DBI/ ) {
+ $config->{ dbh } = $self->db->dbh;
+ continue;
+ }
+ when ( /File|FastMmap|BerkeleyDB/ ) {
+ $config->{ root_dir } ||= tempdir();
+ continue;
+ }
+ when ( /FastMmap/ ) {
+ #$config->{ cache_size } = '64m';
+ continue;
+ }
+ }
+ $config->{namespace} ||= $self->config->get('sitename')->[0];
+ };
+
+ $resolveConf->( $cacheConf );
+ if ( $cacheConf->{l1_cache} ) {
+ $resolveConf->( $cacheConf->{l1_cache} );
+ }
+
+ my $cache = CHI->new( %{$cacheConf} );
+ $self->{_cache} = $cache;
+ }
+ return $self->{_cache};
}
#-------------------------------------------------------------------
diff --git a/lib/WebGUI/Session/Scratch.pm b/lib/WebGUI/Session/Scratch.pm
index 9fb026501..6672082f4 100644
--- a/lib/WebGUI/Session/Scratch.pm
+++ b/lib/WebGUI/Session/Scratch.pm
@@ -66,7 +66,7 @@ sub delete {
my $value = delete $self->{_data}{$name};
my $session = $self->session;
my $id = $session->getId;
- eval{$session->cache->set(["sessionscratch",$id], $self->{_data}, $session->setting->get('sessionTimeout'))};
+ $session->cache->set("sessionscratch_".$id, $self->{_data}, $session->setting->get('sessionTimeout'));
$session->db->write("delete from userSessionScratch where name=? and sessionId=?", [$name, $id]);
return $value;
}
@@ -85,7 +85,7 @@ sub deleteAll {
delete $self->{_data};
my $session = $self->session;
my $id = $session->getId;
- eval{$session->cache->delete(["sessionscratch",$id])};
+ $session->cache->remove("sessionscratch_".$id);
$session->db->write("delete from userSessionScratch where sessionId=?", [$id]);
}
@@ -108,7 +108,7 @@ sub deleteName {
return undef unless ($name);
delete $self->{_data}{$name};
my $session = $self->session;
- eval{$session->cache->flush};
+ $session->cache->clear;
$session->db->write("delete from userSessionScratch where name=?", [$name]);
}
@@ -135,7 +135,7 @@ sub deleteNameByValue {
return undef unless ($name and defined $value);
delete $self->{_data}{$name} if ($self->{_data}{$name} eq $value);
my $session = $self->session;
- eval{$session->cache->flush};
+ $session->cache->clear;
$session->db->write("delete from userSessionScratch where name=? and value=?", [$name,$value]);
}
@@ -186,7 +186,7 @@ sub new {
my ($class, $session) = @_;
my $self = bless { _session => $session }, $class;
weaken $self->{_session};
- my $scratch = eval{$session->cache->get(["sessionscratch",$session->getId])};
+ my $scratch = $session->cache->get("sessionscratch_".$session->getId);
unless (ref $scratch eq "HASH") {
$scratch = $session->db->buildHashRef("select name,value from userSessionScratch where sessionId=?",[$session->getId], {noOrder => 1});
}
@@ -242,7 +242,7 @@ sub set {
$self->{_data}{$name} = $value;
my $session = $self->session;
my $id = $session->getId;
- eval{$session->cache->set(["sessionscratch",$id], $self->{_data}, $session->setting->get('sessionTimeout'))};
+ $session->cache->set("sessionscratch_".$id, $self->{_data}, $session->setting->get('sessionTimeout'));
$session->db->write("replace into userSessionScratch (sessionId, name, value) values (?,?,?)", [$id, $name, $value]);
}
diff --git a/lib/WebGUI/Session/Var.pm b/lib/WebGUI/Session/Var.pm
index 1cc922af9..1dba94d22 100644
--- a/lib/WebGUI/Session/Var.pm
+++ b/lib/WebGUI/Session/Var.pm
@@ -59,7 +59,7 @@ sub end {
my $self = shift;
my $session = $self->session;
my $id = $self->getId;
- eval{$session->cache->delete(['session',$id])};
+ $session->cache->remove($id);
$session->scratch->deleteAll;
$session->db->write("delete from userSession where sessionId=?",[$id]);
delete $session->{_user};
@@ -164,7 +164,7 @@ sub new {
$self->start(1);
}
else { ##existing session requested
- $self->{_var} = eval{$session->cache->get(['session',$sessionId])};
+ $self->{_var} = $session->cache->get($sessionId);
unless ($self->{_var}{sessionId} eq $sessionId) {
$self->{_var} = $session->db->quickHashRef("select * from userSession where sessionId=?",[$sessionId]);
}
@@ -190,7 +190,7 @@ sub new {
}
else {
$self->{_var}{nextCacheFlush} = $time + $session->config->get("hotSessionFlushToDb");
- eval{$session->cache->set(['session',$sessionId], $self->{_var}, $timeout)};
+ $session->cache->set($sessionId, $self->{_var}, $timeout);
}
$self->session->{_sessionId} = $self->{_var}{sessionId};
return $self;
@@ -252,7 +252,7 @@ sub start {
userId => $userId
};
$self->session->{_sessionId} = $sessionId;
- eval{$session->cache->set(['session',$sessionId], $self->{_var}, $timeout)};
+ $session->cache->set($sessionId, $self->{_var}, $timeout);
delete $self->{_var}{nextCacheFlush};
$session->db->setRow("userSession","sessionId",$self->{_var},$sessionId);
$self->{_sessionId} = $sessionId;
@@ -271,7 +271,7 @@ sub switchAdminOff {
my $self = shift;
$self->{_var}{adminOn} = 0;
my $session = $self->session;
- eval{$session->cache->set(['session',$self->getId], $self->{_var}, $session->setting->get('sessionTimeout'))};
+ $session->cache->set($self->getId, $self->{_var}, $session->setting->get('sessionTimeout'));
delete $self->{_var}{nextCacheFlush};
$session->db->setRow("userSession","sessionId", $self->{_var});
}
@@ -288,7 +288,7 @@ sub switchAdminOn {
my $self = shift;
$self->{_var}{adminOn} = 1;
my $session = $self->session;
- eval{$session->cache->set(['session',$self->getId], $self->{_var}, $session->setting->get('sessionTimeout'))};
+ $session->cache->set($self->getId, $self->{_var}, $session->setting->get('sessionTimeout'));
delete $self->{_var}{nextCacheFlush};
$self->session->db->setRow("userSession","sessionId", $self->{_var});
}
diff --git a/lib/WebGUI/User.pm b/lib/WebGUI/User.pm
index 3bf1caea3..883978983 100644
--- a/lib/WebGUI/User.pm
+++ b/lib/WebGUI/User.pm
@@ -282,7 +282,7 @@ sub cache {
for my $k (qw(_userId _user _profile)) {
$userData{$k} = $self->{$k};
}
- eval{$self->session->cache->set(["user",$self->userId], \%userData, 60*60*24)};
+ $self->session->cache->set("user_" . $self->userId, \%userData, 60*60*24);
}
#-------------------------------------------------------------------
@@ -1058,7 +1058,7 @@ sub new {
my $userId = shift || 1;
my $overrideId = shift;
$userId = _create($session, $overrideId) if ($userId eq "new");
- my $self = eval{$session->cache->get(["user",$userId])} || {};
+ my $self = $session->cache->get("user_" . $userId) || {};
bless $self, $class;
$self->{_session} = $session;
unless ($self->{_userId} && $self->{_user}{username}) {
@@ -1333,7 +1333,7 @@ Deletes this user object out of the cache.
sub uncache {
my $self = shift;
- eval{$self->session->cache->delete(["user",$self->userId])};
+ $self->session->cache->remove("user_" . $self->userId);
}
#----------------------------------------------------------------------------
diff --git a/sbin/testEnvironment.pl b/sbin/testEnvironment.pl
index 9a7a299c5..265a628bf 100755
--- a/sbin/testEnvironment.pl
+++ b/sbin/testEnvironment.pl
@@ -150,6 +150,8 @@ checkModule("Business::PayPal::API", "0.62" );
checkModule("Locales", "0.10" );
checkModule("Test::Harness", "3.17" );
checkModule("DateTime::Event::ICal", "0.10" );
+checkModule( "CHI", );
+checkModule( "Cache::FastMmap", );
failAndExit("Required modules are missing, running no more checks.") if $missingModule;
diff --git a/t/Asset.t b/t/Asset.t
index 6d4b5d004..2193794f7 100644
--- a/t/Asset.t
+++ b/t/Asset.t
@@ -21,7 +21,7 @@ use Test::Deep;
use Test::Exception;
use WebGUI::Exception;
-plan tests => 62;
+plan tests => 65;
my $session = WebGUI::Test->session;
@@ -159,6 +159,29 @@ my $session = WebGUI::Test->session;
is $asset->title, 'Root', 'got the right asset';
}
+{
+ note "new (caching), purgeCache";
+ my $testId = 'wg8TestAsset0000000001';
+ my $revisionDate = time();
+ $session->db->write("insert into asset (assetId) VALUES (?)", [$testId]);
+ $session->db->write("insert into assetData (assetId, revisionDate) VALUES (?,?)", [$testId, $revisionDate]);
+
+ my $datum;
+ $datum = $session->cache->get("asset".$testId.$revisionDate);
+ is $datum, undef, 'no cache exists for the test assetId, yet';
+
+ my $testAsset = WebGUI::Asset->new($session, $testId, $revisionDate);
+ $datum = $session->cache->get("asset".$testId.$revisionDate);
+ isnt $datum, undef, 'cache was created on new (from db)';
+
+ $testAsset->purgeCache();
+ $datum = $session->cache->get("asset".$testId.$revisionDate);
+ is $datum, undef, 'purgeCache removes the cache entry';
+
+ $session->db->write("delete from asset where assetId=?", [$testId]);
+ $session->db->write("delete from assetData where assetId=?", [$testId]);
+}
+
{
note "write, update";
diff --git a/t/tests/Test/WebGUI/Asset.pm b/t/tests/Test/WebGUI/Asset.pm
index ed6b3619e..67b840186 100644
--- a/t/tests/Test/WebGUI/Asset.pm
+++ b/t/tests/Test/WebGUI/Asset.pm
@@ -255,40 +255,6 @@ sub getParent : Test(2) {
$session->db->write("delete from assetData where assetId like 'wg8TestAsset00000%'");
}
-sub addRevision : Test(6) {
- my $test = shift;
- my $session = $test->session;
- note "addRevision";
- my $testId1 = 'wg8TestAsset0000000001';
- my $testId2 = 'wg8TestAsset0000000002';
- my $now = time();
- my $revisionDate = $now - 50;
- my $baseLineage = $session->db->quickScalar('select lineage from asset where assetId=?',['PBasset000000000000002']);
- my $testLineage = $baseLineage. '909090';
- $session->db->write("insert into asset (assetId, className, lineage) VALUES (?,?,?)", [$testId1, 'WebGUI::Asset', $testLineage]);
- $session->db->write("insert into assetData (assetId, revisionDate, status) VALUES (?,?,?)", [$testId1, $revisionDate, 'approved']);
- my $testLineage2 = $testLineage . '000001';
- $session->db->write("insert into asset (assetId, className, parentId, lineage) VALUES (?,?,?,?)", [$testId2, 'WebGUI::Asset', $testId1, $testLineage2]);
- $session->db->write("insert into assetData (assetId, revisionDate) VALUES (?,?)", [$testId2, $revisionDate]);
-
- my $testAsset = WebGUI::Asset->new($session, $testId2, $revisionDate);
- $testAsset->title('test title 43');
- $testAsset->write();
- my $tag = WebGUI::VersionTag->getWorking($session);
- my $revAsset = $testAsset->addRevision({}, $now);
- isa_ok $revAsset, 'WebGUI::Asset';
- is $revAsset->revisionDate, $now, 'revisionDate set correctly on new revision';
- is $revAsset->title, 'test title 43', 'data fetch from database correct';
- is $revAsset->revisedBy, $session->user->userId, 'revisedBy is current session user';
- is $revAsset->tagId, $tag->getId, 'tagId is current working tagId';
- my $count = $session->db->quickScalar('SELECT COUNT(*) from assetData where assetId=?',[$testId2]);
- is $count, 2, 'two records in the database';
- WebGUI::Test->addToCleanup($tag);
-
- $session->db->write("delete from asset where assetId like 'wg8TestAsset00000%'");
- $session->db->write("delete from assetData where assetId like 'wg8TestAsset00000%'");
-}
-
sub newByPropertyHashRef : Test(2) {
my $test = shift;
my $session = $test->session;
diff --git a/var/upgrades/upgrade_7.9.3-8.0.0.pl b/var/upgrades/upgrade_7.9.3-8.0.0.pl
index b21d870b2..ef8bf701b 100644
--- a/var/upgrades/upgrade_7.9.3-8.0.0.pl
+++ b/var/upgrades/upgrade_7.9.3-8.0.0.pl
@@ -40,7 +40,11 @@ sub migrateToNewCache {
unlink "../../lib/WebGUI/Workflow/Activity/CleanDatabaseCache.pm";
unlink "../../lib/WebGUI/Workflow/Activity/CleanFileCache.pm";
my $config = $session->config;
- $config->set("cacheServers", [ { "socket" => "/data/wre/var/memcached.sock", "host" => "127.0.0.1", "port" => "11211" } ]);
+ $config->set("cache", {
+ "driver" => "FastMmap",
+ "expires_variance" => "0.10",
+ "root_dir" => "/tmp/WebGUICache",
+ });
$config->set("hotSessionFlushToDb", 600);
$config->delete("disableCache");
$config->delete("cacheType");
diff --git a/www/extras/admin/admin.css b/www/extras/admin/admin.css
index 029c1219d..c7f96b8b8 100644
--- a/www/extras/admin/admin.css
+++ b/www/extras/admin/admin.css
@@ -39,22 +39,22 @@
#locationBar #left {
position: absolute;
- width: 16%;
+ width: 12%;
top: 5px;
left: 0;
}
#locationBar #right {
position: absolute;
- width: 8%;
+ width: 10%;
top: 5px;
right: 0;
}
#locationBar #location {
position: relative;
- margin: auto 7% auto 16%;
- width: 75%;
+ margin: auto 10% auto 12%;
+ width: 77%;
height: 80%;
border: 1px solid #333;
border-radius: 3px;
diff --git a/www/extras/admin/admin.js b/www/extras/admin/admin.js
index 71cf9d95c..71928eef7 100644
--- a/www/extras/admin/admin.js
+++ b/www/extras/admin/admin.js
@@ -7,38 +7,46 @@
if ( typeof WebGUI == "undefined" ) {
WebGUI = {};
}
-WebGUI.Admin = (function(){
- // Public methods
+WebGUI.Admin = function(cfg){
+ // Public properties
+ this.cfg = cfg;
+ this.currentAssetDef = null;
+ this.currentTab = "view"; // "view" or "tree" or other ID
+ this.treeDirty = true;
- return function (cfg) {
- // Public properties
- this.cfg = cfg;
- this.currentAssetDef = null;
- this.viewOrTree = 0; // 0 - Last on View tab. 1 - Last on Tree tab
+ // Default configuration
+ if ( !this.cfg.locationBarId ) {
+ this.cfg.locationBarId = "locationBar";
+ }
+ if ( !this.cfg.tabBarId ) {
+ this.cfg.tabBarId = "tabBar";
+ }
- // Default configuration
- if ( !this.cfg.locationBarId ) {
- this.cfg.locationBarId = "locationBar";
- }
- if ( !this.cfg.tabBarId ) {
- this.cfg.tabBarId = "tabBar";
- }
-
- // Private properties
- var self = this;
-
- // Private methods
- function _init() {
- self.locationBar = new WebGUI.Admin.LocationBar( self.cfg.locationBarId );
- self.tabBar = new YAHOO.widget.TabView( self.cfg.tabBarId );
- // Keep track of View and Tree tabs
- self.tabBar.getTab(0).addListener('click',self.afterShowViewTab,self,true);
- self.tabBar.getTab(1).addListener('click',self.afterShowTreeTab,self,true);
- }
-
- _init();
+ // Private methods
+ var self = this;
+ // Initialize these things AFTER the i18n is fetched
+ var _init = function () {
+ self.locationBar = new WebGUI.Admin.LocationBar( self.cfg.locationBarId );
+ self.tree = new WebGUI.Admin.Tree();
+ self.tabBar = new YAHOO.widget.TabView( self.cfg.tabBarId );
+ // Keep track of View and Tree tabs
+ self.tabBar.getTab(0).addListener('click',self.afterShowViewTab,self,true);
+ self.tabBar.getTab(1).addListener('click',self.afterShowTreeTab,self,true);
};
-})();
+
+ // Get I18N
+ this.i18n = new WebGUI.i18n( {
+ namespaces : {
+ 'WebGUI' : [ '< prev', 'next >', 'locked by' ],
+ 'Asset' : [ 'rank', '99', 'type', 'revision date', 'size', 'locked', 'More', 'unlocked', 'edit' ]
+ },
+ onpreload : {
+ fn : _init
+ }
+ } );
+
+
+};
/**
* afterShowTreeTab()
@@ -47,8 +55,12 @@ WebGUI.Admin = (function(){
WebGUI.Admin.prototype.afterShowTreeTab
= function () {
// Refresh if necessary
+ if ( this.treeDirty ) {
+ this.tree.goto( this.currentAssetDef.url );
+ this.treeDirty = 0;
+ }
// Update last shown view/tree
- this.viewOrTree = 1;
+ this.currentTab = "tree";
};
/**
@@ -58,8 +70,12 @@ WebGUI.Admin.prototype.afterShowTreeTab
WebGUI.Admin.prototype.afterShowViewTab
= function () {
// Refresh if necessary
+ if ( this.viewDirty ) {
+ window.frames[ "view" ].location.href = this.currentAssetDef.url;
+ this.viewDirty = 0;
+ }
// Update last shown view/tree
- this.viewOrTree = 0;
+ this.currentTab = "view";
};
/**
@@ -74,7 +90,15 @@ WebGUI.Admin.prototype.afterShowViewTab
*/
WebGUI.Admin.prototype.gotoAsset
= function ( url ) {
- window.frames[ "view" ].location.href = url;
+ if ( this.currentTab == "view" ) {
+ window.frames[ "view" ].location.href = url;
+ this.treeDirty = 1;
+ }
+ else if ( this.currentTab == "tree" ) {
+ // Make tree request
+ this.tree.goto( this.currentAssetDef.url );
+ this.viewDirty = 1;
+ }
};
/**
@@ -88,20 +112,27 @@ WebGUI.Admin.prototype.navigate
if ( this.currentAssetDef && this.currentAssetDef.assetId == assetDef.assetId ) {
return;
}
-
+
+ // Defer until the locationBar is created
+ if ( !this.locationBar ) {
+ var self = this; // Scope correction
+ return setTimeout( function(){ self.navigate( assetDef ) }, 1000 );
+ }
+
// Update the location bar
this.locationBar.navigate( assetDef );
- // Mark the other frame dirty
+ this.currentAssetDef = assetDef;
};
/****************************************************************************
* WebGUI.Admin.LocationBar
*/
WebGUI.Admin.LocationBar
-= function (id) {
+= function (id, cfg) {
// Public properties
this.id = id; // ID of the element containing the location bar
+ this.cfg = cfg; // Configuration
this.currentAssetDef = null; // Object containing assetId, title, url, icon
this.backAssetDefs = [ ]; // Asset defs to go back to
this.forwardAssetDefs = [ ]; // Asset defs to go forward to
@@ -110,36 +141,41 @@ WebGUI.Admin.LocationBar
var self = this;
var _element = document.getElementById( self.id );
- function _init () {
- // Create buttons
- self.btnBack = new YAHOO.widget.Button( "backButton", {
- type : "split",
- label : '
'
+ + '
'
+ + '