use Storable;
use Time::HiRes qw(time);
use File::Path qw(mkpath);
+use Text::Unaccent::PurePerl;
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 {
if ( ! defined $loaded->{$path}->{columns} ) {
my $columns_path = $self->_permanent_path( 'columns' );
if ( -e $columns_path ) {
- my @columns = map { s/[\r\n]+$//; $_ } read_file $columns_path;
+ my @columns = map { s/[\r\n]+$//; $_ } read_file $columns_path, binmode => ':utf8';
$loaded->{$path}->{columns} = [ @columns ];
warn "# columns_path $columns_path ",dump(@columns);
} else {
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 );
$self->app->home->rel_dir('data') . '/' . join('.', $path, @_);
}
+sub __unac {
+ my $n = shift;
+ $n = unac_string($n);
+ $n =~ s/\W+/_/g;
+ return $n;
+}
+
+sub _column_from_unac {
+ my ($self,$name) = @_;
+
+ my $stats = $self->_loaded('stats');
+ my $cols_norm = { map { __unac( $_ ) => $_ } keys %$stats };
+
+ $cols_norm->{$name} || die "can't find column $name in ", dump($cols_norm);
+}
+
sub _export_path {
my $self = shift;
my $path = $self->_param_or_session('path');
}
my $dir = $self->app->home->rel_dir('public') . "/export/$path";
mkpath $dir unless -e $dir;
- $dir . '/' . join('.', @_);
+ my $name = join('.', map { __unac($_) } @_ );
+ my $full = $dir . '/' . $name;
+ $full =~ s/\/+$// if -d $full; # strip trailing slash for dirs
+ return $full;
}
sub columns {
if ( $self->param('columns') ) {
my @columns = $self->_param_array('columns');
- write_file( $self->_permanent_path( 'columns' ), map { "$_\n" } @columns );
+ write_file( $self->_permanent_path( 'columns' ), { binmode => ':utf8' }, map { "$_\n" } @columns );
$self->redirect_to('/data/items');
}
$self->_filter_on_data( $name, @vals );
if ( my $permanent = $self->param('_permanent') ) {
my $permanent_path = $self->_export_path( 'filter', $name, $permanent );
- write_file $permanent_path, map { "$_\n" } @vals;
+ write_file $permanent_path, { binmode => ':utf8' }, map { "$_\n" } @vals;
warn "permanent filter $permanent_path ", -s $permanent_path;
}
}
sub _current_filters {
my $self = shift;
my $current_filters;
- my $columns = $self->_loaded('header');
- if ( my $sc = $self->session('columns') ) {
- $columns = $sc;
- }
+ my $stats = $self->_loaded('stats');
$current_filters->{ $_ } = $filters->{ $_ }
- foreach ( grep { defined $filters->{ $_ } } @$columns )
+ foreach ( grep { defined $filters->{ $_ } } keys %$stats )
;
- warn "# _current_filters ",dump($columns);
+ warn "# _current_filters ",dump( keys %$current_filters );
return $current_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;
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');
- my $cols_changed;
- my $cols_order;
+ my $commit_changed;
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
+ $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;
+ ( $key, $value, $out ) = ( 'key', 'value' );
foreach ( 0 .. $#$filtered ) {
my $i = $filtered->[$_];
- my $row = $data->{items}->[$i];
- eval $code;
+ __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, $code;
+ write_file( $path, { binmode => ':utf8' }, "$code\n" );
warn "code $path ", -s $path, " bytes saved\n";
}
}
+
+ # remove console
$code = '';
if ( $out ) {
my $commit_dataset = join('.'
, $self->param('code_depends')
, $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 ] };
- $i->{$_} = [ $out->{$n}->{$_} ] foreach keys %{ $out->{$n} };
+ my $ref = ref $out->{$n};
+ if ( $ref eq 'HASH' ) {
+ $i->{$_} = [ $out->{$n}->{$_} ] foreach keys %{ $out->{$n} };
+ } elsif ( $ref eq 'ARRAY' ) {
+ $i->{$_} = $out->{$n};
+ } elsif ( ! $ref ) {
+ $i->{$value} = [ $out->{$n} ];
+ } else {
+ $i->{_error} = [ dump($out->{$n}) ];
+ }
push @$items, $i;
};
undef $out;
$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_rebuild_stats( $path );
+ my $c = { map { $_ => 1 } @columns };
+ my @added_columns = sort grep { ! $c->{$_} } 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 );
+
+ __invalidate_path_column( $path, $_ ) foreach keys %$commit_changed;
}
my $sorted_items;
my $from_end = $sort eq 'd' ? $#$filtered : 0;
- my $out;
+ my $test_changed;
+ my ( $key, $value, $out ) = ( 'key', 'value' ); # XXX make local
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 $row = Storable::dclone $data->{items}->[ $id ];
if ( $code && $test ) {
- $row = Storable::dclone $row;
+ 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($row);
+ warn "EVAL ",dump($update);
+ foreach ( keys %$update ) {
+ $test_changed->{$_}++;
+ $row->{$_} = $update->{$_};
+ }
}
}
$row->{_row_id} ||= $id;
push @$sorted_items, $row;
}
- warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit order $sort";
+ if ( $self->param('export') ) {
+ my $export_path = $self->_export_path( 'items', @columns);
+ open(my $fh, '>', $export_path) || warn "ERROR: can't open $export_path: $!";
+ foreach my $f ( 0 .. $#$filtered ) {
+ print $fh join("\t", map {
+ my $i = $data->{items}->[ $filtered->[$f] ];
+ my $v = '\N';
+ if ( ! defined $i->{$_} ) {
+ # nop
+ } elsif ( ref $i->{$_} eq 'ARRAY' ) {
+ $v =join(',', @{ $i->{$_} });
+ $v = '\N' if length($v) == 0;
+ } else {
+ $v = dump $i->{$_};
+ }
+ $v;
+ } @columns),"\n";
+ }
+ close($fh);
+ warn "export $export_path ", -s $export_path, " bytes\n";
+ }
+
+ warn "# test_changed ",dump( $test_changed );
+ my $c = { map { $_ => 1 } @columns };
+ my @added_columns = sort grep { ! $c->{$_} } keys %$test_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 { $test_changed->{$_} == 0 } keys %$test_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
- warn "# cols_changed ",dump( $cols_changed, $code_depends, $code_description );
+ warn "# test_changed ",dump( $test_changed, $code_depends, $code_description );
$self->render(
order => $order,
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,
warn "# __path_modified $path $value\n";
}
+sub __path_rebuild_stats { $loaded->{ $_[0] }->{rebuild_stats} = 1 };
+
+sub _save_change {
+ my ($self,$change) = @_;
+
+ my $change_path = $self->_permanent_path( 'changes' );
+ mkdir $change_path unless -d $change_path;
+ $change_path .= '/' . $change->{time};
+ store $change, $change_path;
+ utime $change->{time}, $change->{time}, $change_path;
+ warn "_save_change $change_path ", dump($change);
+}
+
sub edit {
my $self = shift;
my $new_content = $self->param('new_content');
if ( $old ne $new
&& ! ( $old eq 'undef' && length($new_content) == 0 ) # new value empty, previous undef
) {
- my $change = {
+ $self->_save_change({
path => $path,
column => $name,
pos => $i,
grep { defined $loaded->{$path}->{stats}->{$_}->{unique} }
keys %{ $loaded->{$path}->{stats} }
},
- };
- my $change_path = $self->_permanent_path( 'changes' );
- mkdir $change_path unless -d $change_path;
- $change_path .= '/' . $change->{time};
- store $change, $change_path;
- utime $change->{time}, $change->{time}, $change_path;
- warn "# $change_path ", dump($change);
+ });
warn "# change $path $i $old -> $new\n";
$loaded->{$path}->{data}->{items}->[$i]->{$name} = $v;
__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);
sub export {
my $self = shift;
+ my $dir = $self->app->home->rel_dir('public');
+
if ( my $import = $self->param('import') ) {
if ( $import =~ m{/filter\.(.+?)\..+} ) {
- my $name = $1;
+ my $name = $self->_column_from_unac( $1 );
+
my @vals = map { chomp; $_ }
- read_file $self->app->home->rel_dir('public') . "/export/$import";
+ read_file "$dir/export/$import", binmode => ':utf8';
+
$self->_remove_filter( $name );
$self->_filter_on_data( $name, @vals );
$self->session( 'offset' => 0 );
}
}
- $self->render( export => [
- glob( $self->_export_path . '*' )
- ] );
+ if ( my $remove = $self->param('remove') ) {
+ my $path = "$dir/export/$remove";
+ unlink $path if -e $path;
+ $path .= '.png';
+ unlink $path if -e $path;
+ }
+
+ my $path = $self->_export_path || $self->redirect_to('/data/index');
+
+ my @files = grep { ! /\.png$/ } glob "$path/*";
+ my $mtime = { map { $_ => (stat($_))[9] } @files };
+ @files = sort { $mtime->{$b} <=> $mtime->{$a} } @files;
+ $self->render( export => [ @files ] );
}
sub __loaded_paths {
projects / MojoFacets.git / blobdiff