my $self = shift;
my $checked;
$checked->{$_}++ foreach @_;
- warn "# _checked ",dump($checked);
+# 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;
$self->session($name => $scalar);
}
- warn "# $name ",dump $scalar;
+ warn "# _perm_scalar $name ",dump $scalar;
return $scalar;
}
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');
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};
}
warn "# filters ",dump($filters);
sub _data_items {
- my $self = shift;
- my $path = $self->session('path') || $self->redirect_to( '/data/index' );
+ 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 ) {
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' );
+ 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;
# 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;
+ }
-# warn "# sorted ", dump @sorted;
+ my $sorted_items;
+ my $data = $self->_loaded('data');
+ foreach ( $offset .. $offset + $limit ) {
+ last unless defined $filtered[$_];
+ push @$sorted_items, $data->{items}->[ $filtered[$_] ];
+ }
- 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,
);
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' ) {
# warn "# facet $name ",dump $facet;
my $checked;
- if ( defined $filters->{$name} ) {
- $checked = $self->_checked( @{ $filters->{$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 ) {
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 edit {
+ my $self = shift;
+ my $content = $self->param('content');
+
+ $self->render(
+ content => $content
+ );
+}
1;