$file =~ s/$data_dir\/*//;
push @files, $file;
} else {
- warn "IGNORE: $file\n";
+ #warn "IGNORE: $file\n";
}
}, $data_dir);
@files = sort { lc $a cmp lc $b } @files;
+ unshift @files, grep { defined $loaded->{$_}->{generated} } keys %$loaded;
my $size;
$size->{$_} = -s "$data_dir/$_" foreach @files;
sub _load_path {
my ( $self, $path ) = @_;
+ return if defined $loaded->{$path}->{'generated'};
+
my $full_path = $self->app->home->rel_file( 'data/' . $path );
die "$full_path $!" unless -r $full_path;
sub load {
my $self = shift;
+ my $path = $self->param('path') || $self->redirect_to( '/data/index' );
+
my @paths = $self->param('paths');
warn "# paths ", dump @paths;
+
+ foreach my $p ( keys %$loaded ) {
+ next if grep { /^\Q$p\E$/ } @paths;
+ warn "remove $p from memory\n";
+ delete $loaded->{$p};
+ }
+
$self->_load_path( $_ ) foreach @paths;
- my $path = $self->param('path') || $self->redirect_to( '/data/index' );
warn "# path $path\n";
$self->_load_path( $path );
foreach my $i ( 0 .. $#$items ) {
if ( defined $items->[$i]->{$name} ) {
- my $i = $items->[$i]->{$name};
- $i = [ $i ] unless ref $i eq 'ARRAY'; # FIXME probably wrong place
- foreach my $v ( @$i ) {
+ my $row = $items->[$i]->{$name};
+ $row = [ $row ] unless ref $row eq 'ARRAY'; # FIXME probably wrong place
+ foreach my $v ( @$row ) {
if ( defined $filter_hash->{ $v } ) {
$filtered_items->{$i}++;
}
warn "filter $name with ", scalar keys %$filtered_items, " items created\n";
}
-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;
- }
- }
- $pass;
- } @items if $filter_value;
- return @items;
-}
-
sub _current_filters {
my $self = shift;
my $current_filters;
+ my $columns = $self->_loaded('header');
+ if ( my $sc = $self->session('columns') ) {
+ $columns = $sc;
+ }
+
$current_filters->{ $_ } = $filters->{ $_ }
- foreach (
- grep { defined $filters->{ $_ } }
- @{ $self->_loaded('header') }
- );
- #warn "# current_filters ",dump($current_filters);
+ foreach ( grep { defined $filters->{ $_ } } @$columns )
+ ;
+ warn "# _current_filters ",dump($columns);
return $current_filters;
}
}
+sub __all_filters {
+ my $order = pop @_;
+ join(',', sort(@_), 'order', $order);
+}
+
sub items {
my $self = shift;
}
}
- my $all_filters = join(' ',sort @filter_names,'order:',$order);
+ my $all_filters = __all_filters( @filter_names,$order );
# warn "# all_filters $all_filters ", dump( $loaded->{$path}->{filtered}->{$all_filters} );
my $commit = $self->param('commit');
my $test = $self->param('test');
+ my $cols_changed;
+
if ( $code && ( $test || $commit ) ) {
# XXX find columns used in code snippet and show them to user
foreach my $column ( $code =~ m/\$row->{(.+?)}/g ) {
if ( $column =~ s/^(['"])// ) {
$column =~ s/$1$//;
}
+ $cols_changed->{$column}++;
next if grep { /$column/ } @columns;
+ $cols_changed->{$column}++;
unshift @columns, $column;
if ( $commit ) {
$self->session('columns', [ @columns ]);
}
}
+ my $code_path = $self->app->home->rel_dir('public') . "/code";
if ( $commit ) {
warn "# commit on ", $#$filtered + 1, " items:\n$code\n";
+ my $out;
foreach ( 0 .. $#$filtered ) {
my $i = $filtered->[$_];
my $row = $data->{items}->[$i];
eval $code;
}
+ if ( my $description = $self->param('code_description') ) {
+ my $depends = $self->param('code_depends') || die "no code_depends?";
+ my $path = "$code_path/$depends.$description.pl";
+ if ( -e $path && ! $self->param('overwrite') ) {
+ warn "# code $path not saved\n";
+ } else {
+ write_file $path, $code;
+ warn "code $path ", -s $path, " bytes saved\n";
+ }
+ }
+ $code = '';
+ if ( $out ) {
+ my $commit_dataset = join('.'
+ , $self->param('code_depends')
+ , $self->param('code_description')
+ );
+ my $key = $self->param('code_depends');
+ $key =~ s/,.+$//;
+ $key ||= 'key';
+ my $items;
+ foreach my $n ( keys %$out ) {
+ my $i = { $key => [ $n ] };
+ $i->{$_} = [ $out->{$n}->{$_} ] foreach keys %{ $out->{$n} };
+ push @$items, $i;
+ };
+ undef $out;
+ my $stats = __stats( $items );
+ my @columns = grep { ! m/^\Q$key\E$/ } sort keys %$stats;
+ unshift @columns, $key;
+
+ $loaded->{$commit_dataset} = {
+ header => [ @columns ],
+ columns => [ @columns ],
+ mtime => time(),
+ data => { items => $items },
+ stats => $stats,
+ generated => 1,
+ };
+ warn "# loaded out ", dump( $loaded->{$commit_dataset} );
+ $self->session('path', $commit_dataset);
+ $self->session('columns', [ @columns ]);
+ $self->session('order', $key);
+ $self->redirect_to('/data/items');
+ }
}
my $sorted_items;
my $from_end = $sort eq 'd' ? $#$filtered : 0;
+ my $out;
foreach ( 0 .. $limit ) {
my $i = $_ + $offset;
last unless defined $filtered->[$i];
warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit order $sort";
+ my $code_depends = $self->param('code_depends')||
+ join(',', grep { defined $cols_changed->{$_} && $cols_changed->{$_} == 1 } @columns );
+ my $code_description = $self->param('code_description') ||
+ join(',', grep { defined $cols_changed->{$_} && $cols_changed->{$_} == 2 } @columns );
+
+ $code_depends ||= $code_description; # self-modifing
+
+ warn "# cols_changed ",dump( $cols_changed, $code_depends, $code_description );
+
$self->render(
order => $order,
offset => $offset,
columns => [ @columns ],
rows => $#$filtered + 1,
numeric => { map { $_, $self->_is_numeric($_) } @columns },
+ unique => { map { $_, $self->_is_unique( $_) } @columns },
filters => $self->_current_filters,
code => $code,
+ cols_changed => $cols_changed,
+ code_depends => $code_depends,
+ code_description => $code_description,
+ code_path => $code_path,
+ out => $out,
);
}
$stats->{$name}->{numeric} > $count / 2;
}
+sub _is_unique {
+ my ( $self, $name ) = @_;
+ my $stats = $self->_loaded( 'stats' );
+ defined $stats->{$name}->{unique};
+}
+
sub _remove_filter {
my ($self,$name) = @_;
warn "_remove_filter $name\n";
warn "filters left: ", keys %{ $loaded->{$path}->{filters} };
foreach (
- grep { /\b$name\b/ }
+ grep { /\Q$name\E/ }
keys %{ $loaded->{$path}->{filtered} }
) {
delete $loaded->{$path}->{filtered}->{$_};
my $data = $self->_loaded('data');
my $filters = $self->_current_filters;
- my $all_filters = join(' ',sort keys %$filters,'order:',$self->session('order'));
+ my $all_filters = __all_filters( keys %$filters,$self->session('order') );
my $filtered = $loaded->{$path}->{filtered}->{$all_filters}
if defined $loaded->{$path}->{filtered}->{$all_filters};
warn "# invalidate $path sorted $name\n";
}
- foreach ( grep { m/$name/ } keys %{ $loaded->{$path}->{filtered} } ) {
+ foreach ( grep { m/\Q$name\E/ } keys %{ $loaded->{$path}->{filtered} } ) {
delete $loaded->{$path}->{filtered}->{$_};
warn "# invalidate $path filtered $_\n";
}
projects / MojoFacets.git / blobdiff