extract changed columns from $update

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

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index ee8bab6..9afa1d0 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -16,6 +16,7 @@ use File::Path qw(mkpath);
 
 use MojoFacets::Import::File;
 use MojoFacets::Import::HTMLTable;
+use MojoFacets::Import::CSV;
 
 our $loaded;
 our $filters;
@@ -38,6 +39,9 @@ sub index {
                } elsif ( -d $file && $file =~ m/\.html$/ ) {
                        $file =~ s/$data_dir\/*//;
                        push @files, $file;
+               } elsif ( -f $file && $file =~ m/\.csv$/i ) {
+                       $file =~ s/$data_dir\/*//;
+                       push @files, $file;
                } else {
                        #warn "IGNORE: $file\n";
                }
@@ -161,7 +165,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 );
 
@@ -178,7 +182,11 @@ sub _load_path {
 
        my $data;
        if ( -f $full_path ) {
-               $data = MojoFacets::Import::File->new( full_path => $full_path, path => $path )->data;
+               if ( $full_path =~ m/.csv/i ) {
+                       $data = MojoFacets::Import::CSV->new( full_path => $full_path )->data;
+               } else {
+                       $data = MojoFacets::Import::File->new( full_path => $full_path, path => $path )->data;
+               }
        } elsif ( -d $full_path && $full_path =~ m/.html/ ) {
                $data = MojoFacets::Import::HTMLTable->new( dir => $full_path )->data;
        } else {
@@ -604,7 +612,7 @@ sub items {
        my $commit = $self->param('commit');
        my $test = $self->param('test');
 
-       my $cols_changed;
+       my $commit_changed;
 
        if ( $code && ( $test || $commit ) ) {
                # XXX find columns used in code snippet and show them to user
@@ -614,18 +622,24 @@ sub items {
                                $column =~ s/$1$//;
                        }
                        next if $column =~ m/\$/; # hide columns with vars in them
-                       $cols_changed->{$column} = 0;
+                       $commit_changed->{$column} = 0;
                }
        }
 
        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];
+                       my $update;
                        eval $code;
+                       foreach ( keys %$update ) {
+                               $commit_changed->{$_}++;
+                               $row->{$_} = $update->{$_};
+                       }
                }
                if ( my $description = $self->param('code_description') ) {
                        my $depends = $self->param('code_depends') || die "no code_depends?";
@@ -670,54 +684,63 @@ 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?
+               __path_modified( $path, 2 );
+               my @added_columns = keys %$commit_changed;
+               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;
        my $from_end = $sort eq 'd' ? $#$filtered : 0;
+       my $test_changed;
        my $out;
        foreach ( 0 .. $limit ) {
                my $i = $_ + $offset;
                last unless defined $filtered->[$i];
                $i = $from_end - $i if $from_end;
                my $id = $filtered->[$i];
-               my $row = $data->{items}->[ $id ];
-               my $old = { map { $_ => 1 } keys %$row };
+               my $row = Storable::dclone $data->{items}->[ $id ];
                if ( $code && $test ) {
-                       $row = Storable::dclone $row;
+                       my $update;
                        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;
+                               warn "EVAL ",dump($update);
+                               foreach ( keys %$update ) {
+                                       $test_changed->{$_}++;
+                                       $row->{$_} = $update->{$_};
+                               }
                        }
                }
                $row->{_row_id} ||= $id;
                push @$sorted_items, $row;
        }
 
-       my @added_columns = sort grep { $cols_changed->{$_} > 0 } keys %$cols_changed;
+       warn "# test_changed ",dump( $test_changed );
+       my $c = { map { $_ => 1 } @columns };
+       my @added_columns = sort grep { ! $c->{$_} } keys %$test_changed;
        unshift @columns, @added_columns;
 
-       if ( $commit ) {
-               $self->session('columns', [ @columns ]);
-               $loaded->{$path}->{columns} = [ @columns ];
-               __path_modified( $path, 2 );
-       }
        warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit order $sort";
 
        my $code_depends = $self->param('code_depends')||
-       join(',', sort grep { $cols_changed->{$_} == 0 } keys %$cols_changed );
+       join(',', sort grep { $test_changed->{$_} == 0 } keys %$test_changed );
        my $code_description = $self->param('code_description') ||
        join(',', @added_columns);
 
        $code_depends ||= $code_description; # self-modifing
 
-       warn "# cols_changed ",dump( $cols_changed, $code_depends, $code_description );
+       warn "# test_changed ",dump( $test_changed, $code_depends, $code_description );
 
        $self->render(
                order => $order,
@@ -730,7 +753,7 @@ sub items {
                unique  => { map { $_, $self->_is_unique( $_) } @columns },
                filters => $self->_current_filters,
                code => $code,
-               cols_changed => $cols_changed,
+               cols_changed => $commit ? $commit_changed : $test_changed,
                code_depends => $code_depends,
                code_description => $code_description,
                code_path => $code_path,