--- lib/Strix.pm	2008/06/20 20:44:18	213
+++ lib/Strix.pm	2008/06/20 21:49:16	216
@@ -14,6 +14,7 @@
 use File::Slurp;
 use JSON::XS;
 use Carp qw/confess/;
+use URI::Escape;
 
 our $debug = 0;
 
@@ -88,13 +89,17 @@
 
 	my $url = shift || confess "no url";
 
+	my $data = $self->read_cache( uri_escape($url) );
+	return $data if $data;
+
 	# sysinc/profiles.php
 	my $sth = $self->dbh->prepare(qq{
 	SELECT kategorija.*, lang.langid, lang.locale, template.tfilename, template.tflags, site.naziv as sitename, site.admin_mail, site.address, site.root as site_root, getPathFromNav(kategorija.id) as path, site.ordstr as site_ordstr FROM kategorija, template, site, lang WHERE kategorija.url = ? AND kategorija.template_id = template.id AND kategorija.site_id = site.id AND lang.id = kategorija.lang
 	});
 	$sth->execute($url);
 
-	my $category = $sth->fetchrow_hashref() or die "can't fetch category $url";
+	my $category = $sth->fetchrow_hashref() or die "can't fetch category $url from instance ",$self->instance,"\n";
+	$self->write_cache( $category, uri_escape($url) );
 	return $category;
 }
 
@@ -109,6 +114,9 @@
 
 	my $url = shift || confess "no url";
 
+	my $data = $self->read_cache( uri_escape($url) );
+	return $data if $data;
+
 	my $dbh = $self->dbh;
 	my $category = $self->category( $url );
 
@@ -183,6 +191,8 @@
 		push @{ $page->{post}->{ $row->{pozicija} } }, { $row->{name} => module_args( $row ) };
 	}
 
+	$self->write_cache( $page, uri_escape($url) );
+
 	return $page;
 
 }
@@ -196,7 +206,8 @@
 sub sites {
 	my $self = shift;
 
-	my @sites;
+	my @sites = $self->read_cache;
+	return @sites if @sites;
 
 	my $sth = $self->dbh->prepare(
 	"SELECT *, coalesce(( length(ordstr)/3 ) - 1,0) AS depth FROM site ORDER BY ordstr"
@@ -207,6 +218,8 @@
 		push @sites, $row;
 	}
 
+	$self->write_cache( \@sites );
+
 	return @sites;
 }
 
@@ -224,11 +237,8 @@
 	$uid ||= 1; # anonymous
 #	$uid ||= 2; # admin
 
-	my $cache_format = 'site-%d-navigation-for-uid-%d.js';
-	if ( my $data = $self->read_cache( $cache_format, $site_id, $uid ) ) {
-		return $data;
-	}
-
+	my $data = $self->read_cache( $site_id, $uid );
+	return $data if $data;
 
 	my $sth = $self->dbh->prepare(
 	"SELECT kategorija.*, ((length(prikaz)+length(coalesce(ordstr,'')))/3)-1 as depth FROM kategorija JOIN navigacija ON (kategorija.id = kategorija_id), site WHERE site_id = ? AND site.id = site_id AND userCanDoOnObject(?, 1, 'kats', kategorija.id) ORDER BY prikaz");
@@ -314,7 +324,7 @@
 
 	}
 
-	$self->write_cache( $navigation, $cache_format, $site_id, $uid );
+	$self->write_cache( $navigation, $site_id, $uid );
 
 	return $navigation;
 
@@ -322,14 +332,18 @@
 
 =head2 cache_path
 
-  my $path = $strix->cache_path( 'format-%d', $var, ... );
+Generate unique name for specified values
+
+  my $path = $strix->cache_path( $var, ... );
+
+Variables have to be path-safe (e.g. use C<uri_encode> if needed)
 
 =cut
 
 sub cache_path {
 	my $self = shift;
 
-	warn "# cache_path",dump( @_ );
+	#warn "# cache_path",dump( @_ );
 
 	my $path = Jifty::Util->absolute_path( 'var/strix' );
 
@@ -337,13 +351,18 @@
 		mkdir $path || die "can't create $path: $!";
 	}
 
-	$path .= '/' . sprintf( shift, @_ );	# XXX shift is important here!
-	return $path;
+	#warn "## caller = ",dump( (caller(2))[3] );
+	my $uid = (caller(2))[3];
+	$uid =~ s/^[^:]+:://;
+	$uid .= '-' . join('-', @_) if @_;
+	$uid .= '.js';
+
+	return $path . '/' . $self->instance . '-' . $uid;
 }
 
 =head2 write_cache
 
-  write_cache( $data, 'format-%d', $var, ... );
+  write_cache( $data, $key_var, ... );
 
 =cut
 
@@ -364,7 +383,7 @@
 	my $self = shift;
 	my $path = $self->cache_path( @_ );
 	return unless -e $path;
-	warn "# read_cache( $path )";
+	#warn "# read_cache( $path )";
 	return decode_json( read_file( $path ) ) || die "can't read $path: $!";
 }