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

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 4ed5237..333b6b2 100644
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -13,6 +13,7 @@ use locale;
 use File::Find;
 
 our $loaded;
+our $filters;
 
 sub index {
 	my $self = shift;
@@ -39,6 +40,7 @@ sub index {
 		files => [ @files ],
 		size => $size,
 		loaded => $loaded,
+		filters => $filters,
 	);
 }
 
@@ -80,7 +82,7 @@ sub _load_path {
 					last;
 				}
 				shift @lines;
-				$v[ $#v ] .= shift @more_v;
+				$v[ $#v ] .= shift @more_v if @more_v;
 				push @v, @more_v if @more_v;
 
 				if ( $#v > $#header ) {
@@ -101,19 +103,21 @@ sub _load_path {
 	foreach my $e ( @{ $data->{items} } ) {
 		foreach my $n ( keys %$e ) {
 			$stats->{$n}->{count}++;
+			my @v;
 			if ( ref $e->{$n} eq 'ARRAY' ) {
-
 				$stats->{$n}->{array} += $#{ $e->{$n} } + 1;
-
-				foreach my $x ( @{$e->{$n}} ) {
-					$stats->{$n}->{numeric}++
-						if $x =~ m/^[-+]?([0-9]*\.[0-9]+|[0-9]+)$/;
-				}
-
+				@v = @{ $e->{$n} };
 			} else {
+				@v = ( $e->{$n} );
+			}
+
+			foreach my $x ( @v ) {
 				$stats->{$n}->{numeric}++
-					if $e->{$n} =~ m/^[-+]?([0-9]*\.[0-9]+|[0-9]+)$/;
+					if $x =~ m/^[-+]?([0-9]*\.[0-9]+|[0-9]+)$/;
+				$stats->{$n}->{empty}++
+					if $x =~ m/^\s*$/;
 			}
+
 		}
 	}
 
@@ -154,9 +158,14 @@ sub load {
 	$self->_load_path( $path );
 
 	$self->session( 'header' => $loaded->{$path}->{header} );
-	$self->session( 'columns' => $loaded->{$path}->{header} );
-
-	$self->redirect_to( '/data/columns' );
+	if ( ! defined $loaded->{$path}->{columns} ) {
+		$self->session( 'columns' => $loaded->{$path}->{header} );
+		$self->redirect_to( '/data/columns' );
+	} else {
+		$self->session( 'columns' => $loaded->{$path}->{columns} );
+		$self->redirect_to( '/data/items' );
+	}
+		
 }
 
 
@@ -169,11 +178,23 @@ sub _loaded {
 }
 
 
+sub _checked {
+	my $self = shift;
+	my $checked;
+	$checked->{$_}++ foreach @_;
+#	warn "# _checked ",dump($checked);
+	return $checked;
+}
 
 
 sub columns {
     my $self = shift;
 
+	if ( $self->param('columns') ) {
+		$self->_perm_array('columns');
+		$self->redirect_to('/data/items');
+	}
+
 	my $stats = $self->_loaded( 'stats' ); # || $self->redirect_to( '/data/index' );
 
 	my @columns;
@@ -195,9 +216,11 @@ sub _perm_array {
     my ($self,$name) = @_;
 
 	my @array = $self->param($name);
+	my $path  = $self->session('path');
 
 	if ( @array ) {
 		$self->session($name => [ @array ]);
+		$loaded->{$path}->{$name} = [ @array ];
 	} elsif ( my $session = $self->session($name) ) {
 		if ( ref $session eq 'ARRAY' ) {
 			@array = @$session;
@@ -226,7 +249,7 @@ sub _perm_scalar {
 		$self->session($name => $scalar);
 	}
 
-	warn "# $name ",dump $scalar;
+	warn "# _perm_scalar $name ",dump $scalar;
 	return $scalar;
 }
 
@@ -236,16 +259,46 @@ sub filter {
 	my $name = $self->param('filter_name') || die "name?";
 	my @vals = $self->param('filter_vals');
 
-	warn "# filter $name vals ",dump(@vals);
+#	warn "# filter $name vals ",dump(@vals);
 
 	my $path = $self->session('path');
-	my $filters = $loaded->{$path}->{filters};
+
 	if ( @vals ) {
 		$filters->{$name} = [ @vals ];
+		warn "# filter + $name $#vals\n";
+
+		my $filter_hash;
+		$filter_hash->{$_}++ foreach @vals;
+
+		warn "# filter_hash ",dump( $filter_hash );
+
+		my $items = $self->_loaded('data')->{items};
+
+		my $include_missing = defined $filter_hash->{_missing};
+		my $filtered_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}++;
+					}
+				}
+			} 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};
 	}
-	$loaded->{$path}->{filters} = $filters;
 
 	warn "# filters ",dump($filters);
 
@@ -254,56 +307,100 @@ sub filter {
 	$self->redirect_to('/data/items');
 }
 
-sub _filter_item {
-	my ( $self, $filters, $i ) = @_;
-	my $pass = 1;
-	foreach my $n ( keys %$filters ) {
-		my @filter_values = @{ $filters->{$n} };
-		my $include_missing = grep { /^_missing/ } @filter_values;
-		if ( ! exists $i->{$n} ) {
-			if ( $include_missing ) {
-				$pass = 1;
-				next;
-			} else {
+
+sub _data_items {
+	my ( $self, $all ) = @_;
+ 	my $data = $self->_loaded( 'data' );
+
+	return @{ $data->{items} } if $all == 1;
+
+	my $filters = $self->_current_filters;
+	my $filter_value;
+	foreach my $f ( keys %$filters ) {
+		foreach my $n ( @{ $filters->{$f} } ) {
+			$filter_value->{$f}->{$n} = 1;
+		}
+	}
+ 	my @items = @{ $data->{items} };
+	@items = grep {
+		my $i = $_;
+		my $pass = 1;
+		foreach my $n ( keys %$filter_value ) {
+			if ( ! exists $i->{$n} ) {
+				if ( defined $filter_value->{$n}->{_missing} ) {
+					$pass = 1;
+					next;
+				} else {
+					$pass = 0;
+					last;
+				}
+			}
+			# and match any of values in element
+			my $have_values = 0;
+			foreach my $v ( @{ $i->{$n} } ) { # FIXME not array?
+				$have_values ||= 1 if defined $filter_value->{$n}->{$v};
+			}
+			if ( ! $have_values ) {
 				$pass = 0;
 				last;
 			}
 		}
-		# and match any of values in element
-		my $have_values = 0;
-		foreach my $v ( @{ $i->{$n} } ) { # FIXME not array?
-			$have_values ||= 1 if grep { m/^\Q$v\E$/ } @filter_values;
-		}
-		if ( ! $have_values ) {
-			$pass = 0;
-			last;
-		}
-	}
-	return $pass;
+		$pass;
+	} @items if $filter_value;
+	return @items;
 }
 
-sub _data_items {
+
+sub _current_filters {
 	my $self = shift;
-	my $path = $self->session('path') || $self->redirect_to( '/data/index' );
-	my $all_filters = $loaded->{$path}->{filters};
-	warn "# all_filters ",dump($all_filters);
-	my $filters;
-	$filters->{ $_ } = $all_filters->{ $_ }
+	my $current_filters;
+	$current_filters->{ $_ } = $filters->{ $_ }
 		foreach (
-			grep { defined $all_filters->{ $_ } }
+			grep { defined $filters->{ $_ } }
 			@{ $self->_loaded('header') }
 		);
-	warn "# filters ",dump($filters);
+	warn "# current_filters ",dump($current_filters);
+	return $current_filters;
+}
+
+sub _data_sorted_by {
+	my ( $self, $order ) = @_;
+
+	my $path = $self->session('path');
+
+	if ( defined $loaded->{$path}->{sorted}->{$order} ) {
+		return $loaded->{$path}->{sorted}->{$order};
+	}
+
  	my $data = $self->_loaded( 'data' );
-	grep {
-		$filters ? $self->_filter_item( $filters, $_ ) : 1;
- 	} @{ $data->{items} };
+	my $numeric = $self->_is_numeric($order);
+	my $missing = $numeric ? 0 : '';
+	no warnings qw(numeric);
+	my $nr = 0;
+	my @sorted = map {
+		$_->[0]
+	} sort {
+		if ( $numeric ) {
+			$a->[1] <=> $b->[1]
+		} else {
+			$a->[1] cmp $b->[1]
+		}
+	} map {
+		[ $nr++, exists $_->{$order} ? join('', @{$_->{$order}}) : $missing ]
+	} @{ $data->{items} }
+	;
+
+	warn "sorted $order"; # ,dump( @sorted );
+
+	$loaded->{$path}->{sorted}->{$order} = [ @sorted ];
 }
 
+
 sub items {
-    my $self = shift;
+	my $self = shift;
 
-	$self->redirect_to('/data/index') unless defined $loaded->{ $self->session('path') };
+	my $path = $self->session('path');
+	$self->redirect_to('/data/index') unless defined $loaded->{ $path };
 
 	my @columns = $self->_perm_array('columns');
 	$self->redirect_to('/data/columns') unless @columns;
@@ -316,29 +413,43 @@ sub items {
 	# fix offset when changing limit
 	$offset = int( $offset / $limit ) * $limit;
 
-	# FIXME - multi-level sort
-	my $numeric = $self->_is_numeric($order);
-	my $missing = $numeric ? 0 : '';
-	no warnings qw(numeric);
-	my @sorted = sort {
-		my $v1 = exists $a->{$order} ? join('', @{$a->{$order}}) : $missing;
-		my $v2 = exists $b->{$order} ? join('', @{$b->{$order}}) : $missing;
-		($v1,$v2) = ($v2,$v1) if $sort eq 'd';
-		$numeric ? $v1 <=> $v2 : $v1 cmp $v2 ;
-	} $self->_data_items;
+	my $sorted = $self->_data_sorted_by( $order );
+
+	my $path_filters = $loaded->{$path}->{filters};
+	my @filter_names = keys %$path_filters;
+
+	my @filtered;
+	foreach my $i ( 0 .. $#$sorted ) {
+		my $pos = $sort eq 'd' ? $sorted->[$i] : $sorted->[ $#$sorted - $i ];
+
+		my $skip = 0;
+		foreach ( @filter_names ) {
+			$skip ||= 1 if ! defined $path_filters->{$_}->{$pos};
+		}
+		next if $skip;
+
+		push @filtered, $pos;
+	}
+
+	my $sorted_items;
+	my $data = $self->_loaded('data');
+	foreach ( $offset .. $offset + $limit ) {
+		last unless defined $filtered[$_];
+		push @$sorted_items, $data->{items}->[ $filtered[$_] ];
+	}
 
-#	warn "# sorted ", dump @sorted;
 
-	my $rows = $#sorted + 1;
+#	warn "# sorted ", dump $sorted;
 
 	$self->render(
 		order => $order,
 		offset => $offset,
 		limit => $limit,
-		sorted => [ splice @sorted, $offset, $limit ],
+		sorted => $sorted_items,
 		columns => [ @columns ],
-		rows => $rows,
+		rows => $#filtered + 1,
 		numeric => { map { $_, $self->_is_numeric($_) } @columns },
+		filters => $self->_current_filters,
 	);
 
 }
@@ -357,8 +468,10 @@ sub _is_numeric {
 	my $stats = $self->_loaded( 'stats' );
 
 	# sort facet numerically if more >50% elements are numeric
+	my $count = $stats->{$name}->{count};
+	$count   -= $stats->{$name}->{empty} if defined $stats->{$name}->{empty};
 	defined $stats->{$name}->{numeric} &&
-		$stats->{$name}->{numeric} > $stats->{$name}->{count} / 2;
+		$stats->{$name}->{numeric} > $count / 2;
 }
 
 sub facet {
@@ -367,14 +480,16 @@ sub facet {
 	my $path = $self->session('path') || $self->redirect_to( '/data/index' );
 
 	if ( my $remove = $self->param('remove') ) {
-		delete $loaded->{$path}->{filters}->{$remove};
+		delete $filters->{$remove};
 		$self->redirect_to( '/data/items' );
 	}
 
 	my $facet;
 	my $name = $self->param('name') || die "no name";
 
-	foreach my $i ( $self->_data_items ) {
+	my $all = $self->_perm_scalar('all', 1);
+
+	foreach my $i ( $self->_data_items($all) ) {
 		if ( ! exists $i->{$name} ) {
 			$facet->{ _missing }++;
 		} elsif ( ref $i->{$name} eq 'ARRAY' ) {
@@ -387,18 +502,19 @@ sub facet {
 #	warn "# facet $name ",dump $facet;
 
 	my $checked;
-	if ( my $f = $loaded->{$path}->{filters} ) {
-		if ( defined $f->{$name} ) {
-			$checked = $self->_checked( @{ $f->{$name} } );
-		}
-	}
+	my @facet_names =
+		  $all                      ? keys %$facet
+		: defined $filters->{$name} ? @{ $filters->{$name} }
+		: keys %$facet;
+
+	$checked = $self->_checked( @{ $filters->{$name} } ) if defined $filters->{$name};
 
 	my $sort = $self->param('sort') || 'c';
 
 	# sort facet numerically if more >50% elements are numeric
 	my $numeric = $self->_is_numeric($name);
 
-	my @facet_names = sort {
+	@facet_names = sort {
 		if ( $sort =~ m/a/i ) {
 			$numeric ? $a <=> $b : lc $a cmp lc $b;
 		} elsif ( $sort =~ m/d/i ) {
@@ -409,19 +525,20 @@ sub facet {
 			warn "unknown sort: $sort";
 			$a cmp $b;
 		}
-	} keys %$facet;
+	} @facet_names;
 
 	$self->render( name => $name, facet => $facet, checked => $checked,
 		facet_names => \@facet_names, sort => $sort, numeric => $numeric,
 	);
 }
 
-sub _checked {
+sub edit {
 	my $self = shift;
-	my $checked;
-	$checked->{$_}++ foreach @_;
-	warn "# _checked ",dump($checked);
-	return $checked;
+	my $content = $self->param('content');
+
+	$self->render(
+		content => $content
+	);
 }
 
 1;