}
}, $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;
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 );
my $test = $self->param('test');
my $cols_changed;
- my $cols_order;
if ( $code && ( $test || $commit ) ) {
# XXX find columns used in code snippet and show them to user
my $order = 0;
- foreach my $column ( $code =~ m/\$row->{(.+?)}/g ) {
+ foreach my $column ( $code =~ m/\$row->{([^}]+)}/g ) {
if ( $column =~ s/^(['"])// ) {
$column =~ s/$1$//;
}
- $cols_changed->{$column}++;
- $cols_order->{$column} = $order++;
- 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 ) {
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";
}
}
$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;
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;
}
- warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit order $sort";
+ my @added_columns = sort grep { $cols_changed->{$_} > 0 } keys %$cols_changed;
+ unshift @columns, @added_columns;
-warn "XXX cols_order ",dump( $cols_order );
+ warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit order $sort";
my $code_depends = $self->param('code_depends')||
- join(',', sort { $cols_order->{$a} <=> $cols_order->{$b} } 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(',', sort { $cols_order->{$a} <=> $cols_order->{$b} } grep { defined $cols_changed->{$_} && $cols_changed->{$_} == 2 } @columns );
+ join(',', @added_columns);
$code_depends ||= $code_description; # self-modifing