added $key and $value for columns in generated dataset

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

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 65e2082..d967f97 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -279,11 +279,18 @@ sub _loaded {
                        warn "rebuild stats for $path ignored caller $caller\n";
                } else {
                        warn "rebuild stats for $path FORCED by modified caller $caller\n";
-                       $loaded->{$path}->{stats} = __stats( $loaded->{$path}->{data}->{items} );
+#                      $loaded->{$path}->{stats} = __stats( $loaded->{$path}->{data}->{items} );
+                       $loaded->{$path}->{rebuild_stats} = 1;
                        $loaded->{$path}->{modified} = 1;
                }
        }
 
+       if ( defined $loaded->{$path}->{rebuild_stats} ) {
+               warn "rebuild_stats $path";
+               $loaded->{$path}->{stats} = __stats( $loaded->{$path}->{data}->{items} );
+               delete $loaded->{$path}->{rebuild_stats};
+       }
+
        if ( ! defined $loaded->{$path}->{$name} ) {
                warn "$path $name isn't loaded\n";
                $self->_load_path( $path );
@@ -542,6 +549,22 @@ sub __all_filters {
        join(',', sort(@_), 'order', $order);
 }
 
+our ($out, $key,$value);
+
+sub __commit_path_code {
+       my ( $path, $i, $code, $commit_changed ) = @_;
+
+       my $items = $loaded->{$path}->{data}->{items} || die "no items for $path";
+       my $row = $items->[$i];
+       my $update;
+       eval $code;
+       foreach ( keys %$update ) {
+               $$commit_changed->{$_}++;
+               $loaded->{$path}->{data}->{items}->[$i]->{$_} = $update->{$_};
+       }
+       #warn "__commit_path_code $path $i ",dump( $update );
+}
+
 sub items {
        my $self = shift;
 
@@ -624,7 +647,7 @@ sub items {
        my $data = $self->_loaded('data');
 
        my $code = $self->_param_scalar('code','');
-       $code =~ s{[\r\n]+$}{}s;
+       $code =~ s{[\r\n]+$}{\n}s;
 
        my $commit = $self->param('commit');
        my $test = $self->param('test');
@@ -647,33 +670,28 @@ sub items {
        if ( $commit ) {
 
                warn "# commit on ", $#$filtered + 1, " items:\n$code\n";
-               my $out;
+               ( $key, $value, $out ) = ( 'key', 'value' );
                foreach ( 0 .. $#$filtered ) {
                        my $i = $filtered->[$_];
-                       my $row = $data->{items}->[$i];
-                       my $update;
-                       eval $code;
-                       foreach ( keys %$update ) {
-                               $commit_changed->{$_}++;
-                               $row->{$_} = $update->{$_};
-                       }
+                       __commit_path_code( $path, $i, $code, \$commit_changed );
                }
+
+               $self->_save_change({
+                       path => $path,
+                       time => $self->param('time') || time(),
+                       user => $self->param('user') || $ENV{'LOGNAME'},
+                       code => $code,
+                       commit_changed => $commit_changed,
+               });
+
                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, { binmode => ':utf8' }, $code );
+                               write_file(  $path, { binmode => ':utf8' }, "$code\n" );
                                warn "code $path ", -s $path, " bytes saved\n";
-
-                               $self->_save_change({
-                                       path => $path,
-                                       time => $self->param('time') || time(),
-                                       user => $self->param('user') || $ENV{'LOGNAME'},
-                                       code => $code,
-                               });
-
                        }
                }
 
@@ -685,9 +703,9 @@ sub items {
                                , $self->param('code_description')
                                , time()
                        );
-                       my $key = $self->param('code_depends');
-                       $key =~ s/,.+$//;
                        $key ||= 'key';
+                       $value ||= 'value';
+                       warn "key $key value $value";
                        my $items;
                        foreach my $n ( keys %$out ) {
                                my $i = { $key => [ $n ] };
@@ -697,7 +715,7 @@ sub items {
                                } elsif ( $ref eq 'ARRAY' ) {
                                        $i->{$_} = $out->{$n};
                                } elsif ( ! $ref ) {
-                                       $i->{value} = [ $out->{$n} ];
+                                       $i->{$value} = [ $out->{$n} ];
                                } else {
                                        $i->{_error} = [ dump($out->{$n}) ];
                                }
@@ -725,7 +743,7 @@ sub items {
                }
 
                # this might move before $out to recalculate stats on source dataset?
-               __path_modified( $path, 2 );
+               __path_rebuild_stats( $path );
                my $c = { map { $_ => 1 } @columns };
                my @added_columns = sort grep { ! $c->{$_} } keys %$commit_changed;
                warn "# added_columns ",dump( @added_columns );
@@ -741,7 +759,7 @@ sub items {
        my $sorted_items;
        my $from_end = $sort eq 'd' ? $#$filtered : 0;
        my $test_changed;
-       my $out;
+       my ( $key, $value, $out ) = ( 'key', 'value' ); # XXX make local
        foreach ( 0 .. $limit ) {
                my $i = $_ + $offset;
                last unless defined $filtered->[$i];
@@ -752,7 +770,7 @@ sub items {
                        my $update;
                        eval $code;
                        if ( $@ ) {
-                               warn "ERROR evaling\n$code\n$@";
+                               warn "ERROR evaling $@", dump($code);
                                $self->stash('eval_error', $@) if $@;
                        } else {
                                warn "EVAL ",dump($update);
@@ -969,6 +987,8 @@ sub __path_modified {
        warn "# __path_modified $path $value\n";
 }
 
+sub __path_rebuild_stats { $loaded->{ $_[0] }->{rebuild_stats} = 1 };
+
 sub _save_change {
        my ($self,$change) = @_;
 
@@ -1029,8 +1049,7 @@ sub edit {
                        __invalidate_path_column( $path, $name );
 
                        $status = 201; # created
-                       # modified = 2 -- force rebuild of stats
-                       __path_modified( $path, 2 );
+                       __path_rebuild_stats( $path );
        
                        $new_content = join("\xB6",@$v);