X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2FMojoFacets%2FData.pm;h=2a35b2db8e37baccd6c3631f7494a6e4e99985ad;hb=d7310b3c552ac0c37c2d85d9c64a46276ade6fff;hp=333b6b20c98c108e293d42f825dfe2c32e380c6e;hpb=93ea74845978684ee81feb5d50144088e0482da3;p=MojoFacets.git

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 333b6b2..2a35b2d 100644
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -115,7 +115,7 @@ sub _load_path {
 				$stats->{$n}->{numeric}++
 					if $x =~ m/^[-+]?([0-9]*\.[0-9]+|[0-9]+)$/;
 				$stats->{$n}->{empty}++
-					if $x =~ m/^\s*$/;
+					if length $x == 0; # faster than $x =~ m/^\s*$/;
 			}
 
 		}
@@ -160,12 +160,13 @@ sub load {
 	$self->session( 'header' => $loaded->{$path}->{header} );
 	if ( ! defined $loaded->{$path}->{columns} ) {
 		$self->session( 'columns' => $loaded->{$path}->{header} );
+		$self->session( 'order'   => $loaded->{$path}->{header}->[0] );
 		$self->redirect_to( '/data/columns' );
 	} else {
 		$self->session( 'columns' => $loaded->{$path}->{columns} );
+		$self->session( 'order'   => $loaded->{$path}->{columns}->[0] );
 		$self->redirect_to( '/data/items' );
 	}
-		
 }
 
 
@@ -228,7 +229,7 @@ sub _perm_array {
 			die "$name not array ",dump($session);
 		}
 	}
-	warn "# $name ",dump @array;
+	#warn "# $name ",dump @array;
 	return @array;
 }
 
@@ -259,55 +260,56 @@ sub filter {
 	my $name = $self->param('filter_name') || die "name?";
 	my @vals = $self->param('filter_vals');
 
-#	warn "# filter $name vals ",dump(@vals);
+	$self->_remove_filter( $name );
+	$self->_filter_on_data( $name, @vals ) if @vals;
+
+	$self->session( 'offset' => 0 );
+
+	$self->redirect_to('/data/items');
+}
+
+sub _filter_on_data {
+	my ( $self, $name, @vals ) = @_;
 
 	my $path = $self->session('path');
 
-	if ( @vals ) {
-		$filters->{$name} = [ @vals ];
-		warn "# filter + $name $#vals\n";
+	if ( ! defined $loaded->{$path}->{stats}->{ $name } ) {
+		warn "filter $name not found in data set";
+		return;
+	}
+
+	$filters->{$name} = [ @vals ];
+	warn "_filter_on_data $name ", $#vals + 1, " values on $path\n";
 
-		my $filter_hash;
-		$filter_hash->{$_}++ foreach @vals;
+	my $filter_hash;
+	$filter_hash->{$_}++ foreach @vals;
 
-		warn "# filter_hash ",dump( $filter_hash );
+	#warn "# filter_hash ",dump( $filter_hash );
 
-		my $items = $self->_loaded('data')->{items};
+	my $items = $self->_loaded('data')->{items};
 
-		my $include_missing = defined $filter_hash->{_missing};
-		my $filtered_items;
+	my $include_missing = defined $filter_hash->{_missing};
+	my $filtered_items;
 
-		foreach my $i ( 0 .. $#$items ) {
+	foreach my $i ( 0 .. $#$items ) {
 
-			if ( defined $items->[$i]->{$name} ) {
-				foreach my $v ( @{ $items->[$i]->{$name} } ) {
-					if ( defined $filter_hash->{ $v } ) {
-						$filtered_items->{$i}++;
-					}
+		if ( defined $items->[$i]->{$name} ) {
+			foreach my $v ( @{ $items->[$i]->{$name} } ) {
+				if ( defined $filter_hash->{ $v } ) {
+					$filtered_items->{$i}++;
 				}
-			} elsif ( $include_missing ) {
-				$filtered_items->{$i}++;
 			}
+		} elsif ( $include_missing ) {
+			$filtered_items->{$i}++;
 		}
-
-		warn "# filter $name ",dump($filtered_items);
-
-		$loaded->{$path}->{filters}->{$name} = $filtered_items;
-
-	} else {
-		warn "# filter - $name\n";
-		delete $filters->{$name};
-		delete $loaded->{$path}->{filters}->{$name};
 	}
 
-	warn "# filters ",dump($filters);
-
-	$self->session( 'offset' => 0 );
+	#warn "# filter $name ",dump($filtered_items);
 
-	$self->redirect_to('/data/items');
+	$loaded->{$path}->{filters}->{$name} = $filtered_items;
+	warn "generated ", scalar keys %$filtered_items, " filtered items\n";
 }
 
-
 sub _data_items {
 	my ( $self, $all ) = @_;
  	my $data = $self->_loaded( 'data' );
@@ -359,7 +361,7 @@ sub _current_filters {
 			grep { defined $filters->{ $_ } }
 			@{ $self->_loaded('header') }
 		);
-	warn "# current_filters ",dump($current_filters);
+	#warn "# current_filters ",dump($current_filters);
 	return $current_filters;
 }
 
@@ -415,31 +417,68 @@ sub items {
 
 	my $sorted = $self->_data_sorted_by( $order );
 
-	my $path_filters = $loaded->{$path}->{filters};
-	my @filter_names = keys %$path_filters;
+	my @filter_names;
+	if ( $filters ) {
+		foreach my $name ( keys %$filters ) {
+			if ( ! defined $loaded->{$path}->{stats}->{ $name } ) {
+				warn "skip filter $name not found in $path\n";
+				next;
+			}
+			push @filter_names, $name;
+		}
+		warn "filter_names ",dump( @filter_names );
+		foreach my $name ( @filter_names ) {
+			next if ref $loaded->{$path}->{filters}->{$name} eq 'ARRAY';
+			$self->_filter_on_data( $name, @{ $filters->{$name} } );
+		}
+	}
+
+	my $filtered_names = join(' ',sort @filter_names);
+
+#	warn "# filtered_names $filtered_names ", dump( $loaded->{$path}->{filtered}->{$filtered_names} );
 
-	my @filtered;
-	foreach my $i ( 0 .. $#$sorted ) {
-		my $pos = $sort eq 'd' ? $sorted->[$i] : $sorted->[ $#$sorted - $i ];
+	if ( ! defined $loaded->{$path}->{filtered}->{$filtered_names} ) {
 
-		my $skip = 0;
-		foreach ( @filter_names ) {
-			$skip ||= 1 if ! defined $path_filters->{$_}->{$pos};
+		my $path_filters = $loaded->{$path}->{filters};
+
+		warn "create combined filter for $filtered_names\n";
+
+		my @filtered;
+		foreach my $i ( 0 .. $#$sorted ) {
+			my $pos = $sorted->[$i];
+
+			if ( $#filter_names == -1 ) {
+				push @filtered, $pos;
+				next;
+			}
+
+			my $skip = 0;
+			foreach ( @filter_names ) {
+				$skip ||= 1 if ! defined $path_filters->{$_}->{$pos};
+			}
+			next if $skip;
+
+			push @filtered, $pos;
 		}
-		next if $skip;
 
-		push @filtered, $pos;
+		$loaded->{$path}->{filtered}->{$filtered_names} = [ @filtered ];
 	}
 
+	my $filtered = $loaded->{$path}->{filtered}->{$filtered_names}
+		if defined $loaded->{$path}->{filtered}->{$filtered_names};
+
+	warn "filters $filtered_names" if $filtered;
+
 	my $sorted_items;
 	my $data = $self->_loaded('data');
-	foreach ( $offset .. $offset + $limit ) {
-		last unless defined $filtered[$_];
-		push @$sorted_items, $data->{items}->[ $filtered[$_] ];
+	my $sort_start = $sort eq 'd' ? $#$filtered : 0;
+	foreach ( 0 .. $limit ) {
+		my $i = $sort_start - ( $_ + $offset );
+		last unless defined $filtered->[$i];
+		push @$sorted_items, $data->{items}->[ $filtered->[$i] ];
 	}
 
-
-#	warn "# sorted ", dump $sorted;
+	warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit";
 
 	$self->render(
 		order => $order,
@@ -447,7 +486,7 @@ sub items {
 		limit => $limit,
 		sorted => $sorted_items,
 		columns => [ @columns ],
-		rows => $#filtered + 1,
+		rows => $#$filtered + 1,
 		numeric => { map { $_, $self->_is_numeric($_) } @columns },
 		filters => $self->_current_filters,
 	);
@@ -474,13 +513,32 @@ sub _is_numeric {
 		$stats->{$name}->{numeric} > $count / 2;
 }
 
+sub _remove_filter {
+	my ($self,$name) = @_;
+	warn "_remove_filter $name\n";
+
+	my $path = $self->session('path');
+
+	delete $filters->{$name};
+	delete $loaded->{$path}->{filters}->{$name};
+	warn "filters left: ", keys %{ $loaded->{$path}->{filters} };
+
+	foreach (
+			grep { /\b$name\b/ }
+			keys %{ $loaded->{$path}->{filtered} }
+	) {
+		delete $loaded->{$path}->{filtered}->{$_};
+		warn "remove filtered cache $_";
+	}
+}
+
 sub facet {
 	my $self = shift;
 
 	my $path = $self->session('path') || $self->redirect_to( '/data/index' );
 
-	if ( my $remove = $self->param('remove') ) {
-		delete $filters->{$remove};
+	if ( my $name = $self->param('remove') ) {
+		$self->_remove_filter( $name );
 		$self->redirect_to( '/data/items' );
 	}
 
@@ -488,14 +546,29 @@ sub facet {
 	my $name = $self->param('name') || die "no name";
 
 	my $all = $self->_perm_scalar('all', 1);
+	my $data = $self->_loaded('data');
+
+	my $filters = $self->_current_filters;
+	my $filtered_names = join(' ',sort keys %$filters);
+#	warn "# filtered_names $filtered_names ", dump( $loaded->{$path}->{filtered}->{$filtered_names} );
+	my $filtered = $loaded->{$path}->{filtered}->{$filtered_names}
+		if defined $loaded->{$path}->{filtered}->{$filtered_names};
+
+	if ( ! $filtered || $all ) {
+		$filtered = [ 0 .. $#{ $data->{items} } ];
+		warn "filter all values\n";
+	} else {
+		warn "filter using $filtered_names\n";
+	}
 
-	foreach my $i ( $self->_data_items($all) ) {
-		if ( ! exists $i->{$name} ) {
+	foreach my $i ( @$filtered ) {
+		my $item = $data->{items}->[$i];
+		if ( ! exists $item->{$name} ) {
 			$facet->{ _missing }++;
-		} elsif ( ref $i->{$name} eq 'ARRAY' ) {
-			$facet->{$_}++ foreach @{ $i->{$name} };
+		} elsif ( ref $item->{$name} eq 'ARRAY' ) {
+			$facet->{$_}++ foreach @{ $item->{$name} };
 		} else {
-			$facet->{ $i->{$name} }++;
+			$facet->{ $item->{$name} }++;
 		}
 	}
 
@@ -520,7 +593,7 @@ sub facet {
 		} elsif ( $sort =~ m/d/i ) {
 			$numeric ? $b <=> $a : lc $b cmp lc $a;
 		} elsif ( $sort =~ m/c/i ) {
-			$facet->{$b} <=> $facet->{$a};
+			( $facet->{$b} || -1 ) <=> ( $facet->{$a} || -1 )
 		} else {
 			warn "unknown sort: $sort";
 			$a cmp $b;