} elsif ( -f $file && $file =~ m/\.csv$/i ) {
$file =~ s/$data_dir\/*//;
push @files, $file;
+ } elsif ( -f $file && $file =~ m/\.storable/i ) {
+ $file =~ s/$data_dir\/*//;
+ push @files, $file;
} else {
#warn "IGNORE: $file\n";
}
}, $data_dir);
+ no warnings qw(uninitialized); # mtime
@files = sort { $loaded->{$b}->{mtime} <=> $loaded->{$a}->{mtime} || lc $a cmp lc $b } @files,
grep { defined $loaded->{$_}->{generated} } keys %$loaded;
my $size;
sub _load_path {
my ( $self, $path ) = @_;
- return if defined $loaded->{$path}->{'generated'};
+ return if defined $loaded->{$path}->{generated};
my $full_path = $self->app->home->rel_file( 'data/' . $path );
$self->redirect_to('/data/index') unless -r $full_path;
if ( -f $full_path ) {
if ( $full_path =~ m/.csv/i ) {
$data = MojoFacets::Import::CSV->new( full_path => $full_path )->data;
+ } elsif ( $full_path =~ m/.storable/ ) {
+ warn "open $full_path ", -s $full_path, " bytes";
+ open(my $pipe, "<", $full_path) || die $!;
+ while ( my $o = eval { Storable::fd_retrieve $pipe } ) {
+ if ( defined $o->{item} ) {
+ push @{ $data->{items} }, $o->{item};
+ } else {
+ warn "SKIP ",dump($o);
+ }
+ }
+ close($pipe);
+ warn "loaded ", $#{ $data->{items} } + 1, " items from $full_path\n";
+ $data->{generated}++;
} else {
$data = MojoFacets::Import::File->new( full_path => $full_path, path => $path )->data;
}
size => -s $full_path,
mtime => (stat($full_path))[9],
data => $data,
+ defined $data->{generated} ? ( generated => 1 ) : (),
};
$loaded->{ $path } = $info;
- $self->_save( $path );
+ $self->_save( $path ) unless $info->{generated};
}
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;
- my $name = join('.', map { my $n = unac_string($_); $n =~ s/\W+/_/g; $n; } @_ );
- $dir . '/' . $name;
+ my $name = join('.', map { __unac($_) } @_ );
+ my $full = $dir . '/' . $name;
+ $full =~ s/\/+$// if -d $full; # strip trailing slash for dirs
+ return $full;
}
sub columns {
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}{}gs;
+ $code =~ s{\n+$}{\n}s;
my $commit = $self->param('commit');
my $test = $self->param('test');
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";
}
}
+
+ # remove console
$code = '';
if ( $out ) {
my $commit_dataset = join('.'
, $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 ] };
} elsif ( $ref eq 'ARRAY' ) {
$i->{$_} = $out->{$n};
} elsif ( ! $ref ) {
- $i->{value} = [ $out->{$n} ];
+ $i->{$value} = [ $out->{$n} ];
} else {
$i->{_error} = [ dump($out->{$n}) ];
}
}
# 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 );
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];
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);
} elsif ( ref $i->{$_} eq 'ARRAY' ) {
$v =join(',', @{ $i->{$_} });
$v = '\N' if length($v) == 0;
+ } elsif ( ! ref $i->{$_} ) {
+ $v = $i->{$_};
} else {
$v = dump $i->{$_};
}
join(',', @added_columns);
$code_depends ||= $code_description; # self-modifing
+ if ( ! $code_depends && $out ) {
+ $code_depends = $key;
+ $code_description = $value;
+ }
warn "# test_changed ",dump( $test_changed, $code_depends, $code_description );
}
}
+ if ( my $code = $self->param('code') ) {
+ my $out;
+ foreach my $v ( keys %$facet ) {
+ my $c = $facet->{$v};
+ eval $code;
+ if ( $@ ) {
+ $out = $@;
+ warn "ERROR: $@\n$code\n";
+ last;
+ }
+ }
+ warn "out ",dump( $out );
+ $self->stash( out => $out );
+ }
+
# warn "# facet $name ",dump $facet;
my $checked;
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);
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 "$dir/export/$import", binmode => ':utf8';
+
$self->_remove_filter( $name );
$self->_filter_on_data( $name, @vals );
$self->session( 'offset' => 0 );