redirect to /data/index if path doesn't exist

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

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 71a476f..17cd670 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -43,8 +43,8 @@ sub index {
                }
        }, $data_dir);
 
-       @files = sort { lc $a cmp lc $b } @files;
-       unshift @files, grep { defined $loaded->{$_}->{generated} } keys %$loaded;
+       @files = sort { $loaded->{$b}->{mtime} <=> $loaded->{$a}->{mtime} || lc $a cmp lc $b } @files,
+                       grep { defined $loaded->{$_}->{generated} } keys %$loaded;
        my $size;
        $size->{$_} = -s "$data_dir/$_" foreach @files;
 
@@ -161,7 +161,7 @@ sub _load_path {
        return if defined $loaded->{$path}->{'generated'};
 
        my $full_path = $self->app->home->rel_file( 'data/' . $path );
-       die "$full_path $!" unless -r $full_path;
+       $self->redirect_to('/data/index') unless -r $full_path;
 
        my $dump_path = $self->_dump_path( $path );
 
@@ -493,8 +493,16 @@ sub _data_sorted_by {
                        $a->[1] cmp $b->[1]
                }
        } map {
-               [ $nr++, exists $_->{$order} ? join('', @{$_->{$order}}) : $missing ]
-       } grep { ref $_->{$order} eq 'ARRAY' } @{ $data->{items} }
+               my $v;
+               if ( ! exists $_->{$order} ) {
+                       $v = $missing;
+               } elsif ( ref $_->{$order} eq 'ARRAY' ) {
+                       $v = join('', @{$_->{$order}});
+               } else {
+                       $v = $_->{$order};
+               }
+               [ $nr++, $v ]
+       } @{ $data->{items} }
        ;
 
        warn "sorted: $order numeric: $numeric items: ", $#sorted + 1, "\n";
@@ -600,24 +608,22 @@ sub items {
 
        if ( $code && ( $test || $commit ) ) {
                # XXX find columns used in code snippet and show them to user
-               foreach my $column ( $code =~ m/\$row->{(.+?)}/g ) {
+               my $order = 0;
+               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 ]);
-                               $loaded->{$path}->{columns} = [ @columns ];
-                               __path_modified( $path, 2 );
-                       }
+                       next if $column =~ m/\$/; # hide columns with vars in them
+                       $cols_changed->{$column} = 0;
                }
        }
 
        my $code_path = $self->app->home->rel_dir('public') . "/code";
        if ( $commit ) {
+
+               my $o = { map { $_ => 1 } grep { defined $loaded->{$path}->{stats}->{$_}->{count} } keys %{ $self->_loaded('stats') } };
+               #warn "XXX o ",dump( $o );
+
                warn "# commit on ", $#$filtered + 1, " items:\n$code\n";
                my $out;
                foreach ( 0 .. $#$filtered ) {
@@ -631,7 +637,7 @@ sub items {
                        if ( -e $path && ! $self->param('overwrite') ) {
                                warn "# code $path not saved\n";
                        } else {
-                               write_file $path, $code;
+                               write_file(  $path, { binmode => ':utf8' }, $code );
                                warn "code $path ", -s $path, " bytes saved\n";
                        }
                }
@@ -668,7 +674,23 @@ sub items {
                        $self->session('columns', [ @columns ]);
                        $self->session('order', $key);
                        $self->redirect_to('/data/items');
+                       return; # FIXME needed to correctly show columns
                }
+
+               # this might move before $out to recalculate stats on source dataset?
+               my $c = { map { $_ => 1 } @columns };
+               #warn "XXX c ",dump( $c );
+
+               __path_modified( $path, 2 );
+               $o->{$_}-- foreach keys %{ $self->_loaded('stats') };
+               #warn "XXX o ",dump( $o );
+               my @added_columns = grep { $o->{$_} && ! $c->{$_} } keys %$o;
+               warn "# added_columns ",dump( @added_columns );
+               unshift @columns, @added_columns;
+
+               $self->session('columns', [ @columns ]);
+               $loaded->{$path}->{columns} = [ @columns ];
+               warn "# new columns ",dump( @columns );
        }
 
        my $sorted_items;
@@ -679,27 +701,33 @@ sub items {
                last unless defined $filtered->[$i];
                $i = $from_end - $i if $from_end;
                my $id = $filtered->[$i];
-               my $row = $data->{items}->[ $id ];
+               my $row = Storable::dclone $data->{items}->[ $id ];
+               my $old = { map { $_ => 1 } keys %$row };
                if ( $code && $test ) {
-                       $row = Storable::dclone $row;
                        eval $code;
                        if ( $@ ) {
                                warn "ERROR evaling\n$code\n$@";
                                $self->stash('eval_error', $@) if $@;
                        } else {
                                warn "EVAL ",dump($row);
+                               $old->{$_}-- foreach keys %$row;
+                               warn "columns changed ",dump($old);
+                               $cols_changed->{$_}++ foreach grep { $old->{$_} == -1 } keys %$old;
                        }
                }
                $row->{_row_id} ||= $id;
                push @$sorted_items, $row;
        }
 
+       my @added_columns = sort grep { $cols_changed->{$_} > 0 } keys %$cols_changed;
+       unshift @columns, @added_columns;
+
        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 );
+       join(',', sort grep { $cols_changed->{$_} == 0 } keys %$cols_changed );
        my $code_description = $self->param('code_description') ||
-       join(',', grep { defined $cols_changed->{$_} && $cols_changed->{$_} == 2 } @columns );
+       join(',', @added_columns);
 
        $code_depends ||= $code_description; # self-modifing