cleanup all_filters name generation

[MojoFacets.git] / lib / MojoFacets / Data.pm

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 3451c6d..8a52a85 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -44,6 +44,7 @@ sub index {
        }, $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;
 
@@ -157,6 +158,8 @@ sub stats {
 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;
 
@@ -453,12 +456,15 @@ sub _filter_on_data {
 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('columns') }
-               );
-       #warn "# current_filters ",dump($current_filters);
+               foreach ( grep { defined $filters->{ $_ } } @$columns )
+       ;
+       warn "# _current_filters ",dump($columns);
        return $current_filters;
 }
 
@@ -498,6 +504,11 @@ sub _data_sorted_by {
 }
 
 
+sub __all_filters {
+       my $order = pop @_;
+       join(',', sort(@_), 'order', $order);
+}
+
 sub items {
        my $self = shift;
 
@@ -541,7 +552,7 @@ sub items {
                }
        }
 
-       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} );
 
@@ -605,8 +616,10 @@ sub items {
                }
        }
 
+       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];
@@ -614,15 +627,53 @@ sub items {
                }
                if ( my $description = $self->param('code_description') ) {
                        my $depends = $self->param('code_depends') || die "no code_depends?";
-                       my $path = $self->app->home->rel_dir('public') . "/code/$depends.$description.pl";
-                       write_file $path, $code;
-                       warn "code $path ", -s $path, " bytes saved\n";
+                       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];
@@ -645,6 +696,15 @@ sub items {
 
        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,
@@ -653,11 +713,14 @@ sub items {
                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 => join(',', grep { defined $cols_changed->{$_} && $cols_changed->{$_} == 1 } @columns ),
-               code_description => join(',', grep { defined $cols_changed->{$_} && $cols_changed->{$_} == 2 } @columns ),
+               code_depends => $code_depends,
+               code_description => $code_description,
+               code_path => $code_path,
+               out => $out,
        );
 
 }
@@ -682,6 +745,12 @@ sub _is_numeric {
                $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";
@@ -693,7 +762,7 @@ sub _remove_filter {
        warn "filters left: ", keys %{ $loaded->{$path}->{filters} };
 
        foreach (
-                       grep { /\b$name\b/ }
+                       grep { /\Q$name\E/ }
                        keys %{ $loaded->{$path}->{filtered} }
        ) {
                delete $loaded->{$path}->{filtered}->{$_};
@@ -718,7 +787,7 @@ sub facet {
        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};
 
@@ -786,7 +855,7 @@ sub __invalidate_path_column {
                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";
        }