mark all columns used in code

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

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 61c294c..32f532e 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -253,7 +253,7 @@ sub _loaded {
        my $path = $self->session('path') || $self->param('path');
        $self->redirect_to('/data/index') unless $path;
 
-       if ( $loaded->{$path}->{modified} > 1 ) {
+       if ( defined $loaded->{$path}->{modified} && $loaded->{$path}->{modified} > 1 ) {
                my $caller = (caller(1))[3];
                if ( $caller =~ m/::edit/ ) {
                        warn "rebuild stats for $path ignored caller $caller\n";
@@ -267,12 +267,14 @@ sub _loaded {
        if ( ! defined $loaded->{$path}->{$name} ) {
                warn "$path $name isn't loaded\n";
                $self->_load_path( $path );
-               $self->redirect_to('/data/index')
-                       unless defined $loaded->{$path}->{$name};
                if ( ! defined $loaded->{$path}->{stats} ) {
                        warn "rebuild stats for $path\n";
                        $loaded->{$path}->{stats} = __stats( $loaded->{$path}->{data}->{items} );
                }
+               if ( ! defined $loaded->{$path}->{$name} ) {
+                       warn "MISSING $name for $path\n";
+                       $self->redirect_to('/data/index')
+               }
        }
 
        $self->session( 'modified' => $loaded->{$path}->{modified} );
@@ -370,7 +372,7 @@ sub _param_scalar {
                $self->session($name => $scalar);
        }
 
-       warn "# _perm_scalar $name ",dump $scalar;
+       warn "# _param_scalar $name ",dump $scalar;
        return $scalar;
 }
 
@@ -421,7 +423,9 @@ sub _filter_on_data {
        foreach my $i ( 0 .. $#$items ) {
 
                if ( defined $items->[$i]->{$name} ) {
-                       foreach my $v ( @{ $items->[$i]->{$name} } ) {
+                       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}++;
                                }
@@ -531,8 +535,12 @@ sub _data_sorted_by {
 sub items {
        my $self = shift;
 
+       if ( my $show = $self->param('id') ) {
+               $self->param('show', $show);
+               warn "show $show\n";
+       }
+
        my $path = $self->session('path');
-       $self->redirect_to('/data/index') unless defined $loaded->{ $path };
 
        my @columns = $self->_param_array('columns');
        $self->redirect_to('/data/columns') unless @columns;
@@ -545,6 +553,10 @@ sub items {
        # fix offset when changing limit
        $offset = int( $offset / $limit ) * $limit;
 
+       if ( ! grep { /^\Q$order\E$/ } @columns ) {
+               $order = $columns[0];
+               $self->session( order => $order );
+       }
        my $sorted = $self->_data_sorted_by( $order );
 
        my @filter_names;
@@ -599,31 +611,64 @@ sub items {
 
        warn "all_filters $all_filters produced ", $#$filtered + 1, " items\n" if $filtered;
 
-       my $code = $self->param('code');
-       my $commit_code = $self->param('commit');
+       my $data = $self->_loaded('data');
+
+       my $code = $self->_param_scalar('code','');
+       $code =~ s{[\r\n]+$}{}s;
+
+       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 ]);
+                               $loaded->{$path}->{columns} = [ @columns ];
+                               __path_modified( $path, 2 );
+                       }
+               }
+       }
+
+       if ( $commit ) {
+               warn "# commit on ", $#$filtered + 1, " items:\n$code\n";
+               foreach ( 0 .. $#$filtered ) {
+                       my $i = $filtered->[$_];
+                       my $row = $data->{items}->[$i];
+                       eval $code;
+               }
+               $code = '';
+       }
 
        my $sorted_items;
-       my $data = $self->_loaded('data');
        my $from_end = $sort eq 'd' ? $#$filtered : 0;
        foreach ( 0 .. $limit ) {
                my $i = $_ + $offset;
                last unless defined $filtered->[$i];
                $i = $from_end - $i if $from_end;
                my $id = $filtered->[$i];
-               my $rec = $data->{items}->[ $id ];
-               $rec->{_row_id} ||= $id;
-               if ( $code ) {
-                       $rec = Storable::dclone $rec if ! $commit_code;
+               my $row = $data->{items}->[ $id ];
+               if ( $code && $test ) {
+                       $row = Storable::dclone $row;
                        eval $code;
                        if ( $@ ) {
                                warn "ERROR evaling\n$code\n$@";
-                               undef $code;
                                $self->stash('eval_error', $@) if $@;
                        } else {
-                               warn "EVAL $code ",dump($rec);
+                               warn "EVAL ",dump($row);
                        }
                }
-               push @$sorted_items, $rec;
+               $row->{_row_id} ||= $id;
+               push @$sorted_items, $row;
        }
 
        warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit order $sort";
@@ -637,6 +682,8 @@ sub items {
                rows => $#$filtered + 1,
                numeric => { map { $_, $self->_is_numeric($_) } @columns },
                filters => $self->_current_filters,
+               code => $code,
+               cols_changed => $cols_changed,
        );
 
 }