From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Thu, 17 Jun 2010 14:26:30 +0000 (+0200)
Subject: don't redirect to /data/index needlessly
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;ds=sidebyside;h=83132a946e365cb2b134f26bed859f60bcdb2eda;hp=-c;p=MojoFacets.git

don't redirect to /data/index needlessly

This allow us to restart server and just load needed data on demand with
reload as opposed to first selecting active dataset and rest of the
stuff which we allready have in session.
---

83132a946e365cb2b134f26bed859f60bcdb2eda
diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 8bf9aa3..c2283b8 100644
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -267,12 +267,14 @@ sub _loaded {
 	if ( ! defined $loaded->{$path}->{$name} ) {
 		warn "$path $name isn't loaded\n";
 		$self->_load_path( $path );
-		$self->redirect_to('/data/index')
-			unless defined $loaded->{$path}->{$name};
 		if ( ! defined $loaded->{$path}->{stats} ) {
 			warn "rebuild stats for $path\n";
 			$loaded->{$path}->{stats} = __stats( $loaded->{$path}->{data}->{items} );
 		}
+		if ( ! defined $loaded->{$path}->{$name} ) {
+			warn "MISSING $name for $path\n";
+			$self->redirect_to('/data/index')
+		}
 	}
 
 	$self->session( 'modified' => $loaded->{$path}->{modified} );
@@ -537,7 +539,6 @@ sub items {
 	}
 
 	my $path = $self->session('path');
-	$self->redirect_to('/data/index') unless defined $loaded->{ $path };
 
 	my @columns = $self->_param_array('columns');
 	$self->redirect_to('/data/columns') unless @columns;