use MojoFacets::Import::File;
use MojoFacets::Import::HTMLTable;
+use MojoFacets::Import::CSV;
our $loaded;
our $filters;
} 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";
}
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 $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 {
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 ) {
$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 $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 ) {
+ $cols_changed->{$_}++;
+ $row->{$_} = $update->{$_};
+ }
}
}
$row->{_row_id} ||= $id;
my @added_columns = sort grep { $cols_changed->{$_} > 0 } keys %$cols_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')||