use Storable;
use Time::HiRes qw(time);
use File::Path qw(mkpath);
+use Text::Unaccent::PurePerl;
use MojoFacets::Import::File;
use MojoFacets::Import::HTMLTable;
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 {
$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;
}
} else {
write_file( $path, { binmode => ':utf8' }, $code );
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,
+ });
+
}
}
+
+ # remove console
$code = '';
if ( $out ) {
my $commit_dataset = join('.'
push @$sorted_items, $row;
}
- my $export_path = "public/export/$path/" . join('.', @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] ];
- if ( ref $i->{$_} eq 'ARRAY' ) {
- join(',', @{ $i->{$_} });
- } else {
- dump $i->{$_};
- }
- } @columns),"\n";
+ 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";
}
- close($fh);
- warn "$export_path ", -s $export_path, " bytes\n";
warn "# test_changed ",dump( $test_changed );
my $c = { map { $_ => 1 } @columns };
warn "# __path_modified $path $value\n";
}
+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;
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 {