}
if ( $unique ) {
$stats->{$n}->{unique} = 1;
- warn "# $n unique ",dump( $unique );
+ #warn "# $n unique ",dump( $unique );
}
}
}
$self->_load_path( $path );
$self->session( 'path' => $path );
- $self->session( 'modified' => $loaded->{$path}->{modified} );
my $redirect_to = '/data/items';
my $path = $self->session('path') || $self->param('path');
$self->redirect_to('/data/index') unless $path;
- if ( $loaded->{$path}->{modified} > 1 ) {
- warn "rebuild stats for $path forced by modified\n";
- $loaded->{$path}->{stats} = __stats( $loaded->{$path}->{data}->{items} );
- $loaded->{$path}->{modified} = 1;
+ if ( defined $loaded->{$path}->{modified} && $loaded->{$path}->{modified} > 1 ) {
+ my $caller = (caller(1))[3];
+ if ( $caller =~ m/::edit/ ) {
+ 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}->{modified} = 1;
+ }
}
if ( ! defined $loaded->{$path}->{$name} ) {
warn "$path $name isn't loaded\n";
$self->_load_path( $path );
- $self->redirect_to('/data/index')
- unless defined $loaded->{$path}->{$name};
if ( ! defined $loaded->{$path}->{stats} ) {
warn "rebuild stats for $path\n";
$loaded->{$path}->{stats} = __stats( $loaded->{$path}->{data}->{items} );
}
+ if ( ! defined $loaded->{$path}->{$name} ) {
+ warn "MISSING $name for $path\n";
+ $self->redirect_to('/data/index')
+ }
}
+
+ $self->session( 'modified' => $loaded->{$path}->{modified} );
+
return $loaded->{$path}->{$name};
}
sub _export_path {
my $self = shift;
- my $path = $self->_param_or_session('path') || die "no path";
+ my $path = $self->_param_or_session('path');
+ if ( ! $path ) {
+ warn "no path in param or session";
+ return;
+ }
my $dir = $self->app->home->rel_dir('public') . "/export/$path";
mkpath $dir unless -e $dir;
$dir . '/' . join('.', @_);
$self->session($name => $scalar);
}
- warn "# _perm_scalar $name ",dump $scalar;
+ warn "# _param_scalar $name ",dump $scalar;
return $scalar;
}
foreach my $i ( 0 .. $#$items ) {
if ( defined $items->[$i]->{$name} ) {
- foreach my $v ( @{ $items->[$i]->{$name} } ) {
+ my $row = $items->[$i]->{$name};
+ $row = [ $row ] unless ref $row eq 'ARRAY'; # FIXME probably wrong place
+ foreach my $v ( @$row ) {
if ( defined $filter_hash->{ $v } ) {
$filtered_items->{$i}++;
}
sub items {
my $self = shift;
+ if ( my $show = $self->param('id') ) {
+ $self->param('show', $show);
+ warn "show $show\n";
+ }
+
my $path = $self->session('path');
- $self->redirect_to('/data/index') unless defined $loaded->{ $path };
my @columns = $self->_param_array('columns');
$self->redirect_to('/data/columns') unless @columns;
# fix offset when changing limit
$offset = int( $offset / $limit ) * $limit;
+ if ( ! grep { /^\Q$order\E$/ } @columns ) {
+ $order = $columns[0];
+ $self->session( order => $order );
+ }
my $sorted = $self->_data_sorted_by( $order );
my @filter_names;
warn "all_filters $all_filters produced ", $#$filtered + 1, " items\n" if $filtered;
- my $sorted_items;
my $data = $self->_loaded('data');
+
+ my $code = $self->_param_scalar('code','');
+ $code =~ s{[\r\n]+$}{}s;
+
+ my $commit = $self->param('commit');
+ my $test = $self->param('test');
+
+ my $cols_changed;
+
+ if ( $code && ( $test || $commit ) ) {
+ # XXX find columns used in code snippet and show them to user
+ foreach my $column ( $code =~ m/\$row->{(.+?)}/g ) {
+ if ( $column =~ s/^(['"])// ) {
+ $column =~ s/$1$//;
+ }
+ $cols_changed->{$column}++;
+ 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 );
+ }
+ }
+ }
+
+ if ( $commit ) {
+ warn "# commit on ", $#$filtered + 1, " items:\n$code\n";
+ foreach ( 0 .. $#$filtered ) {
+ my $i = $filtered->[$_];
+ my $row = $data->{items}->[$i];
+ eval $code;
+ }
+ $code = '';
+ }
+
+ my $sorted_items;
my $from_end = $sort eq 'd' ? $#$filtered : 0;
foreach ( 0 .. $limit ) {
my $i = $_ + $offset;
last unless defined $filtered->[$i];
$i = $from_end - $i if $from_end;
my $id = $filtered->[$i];
- push @$sorted_items,
- my $item = $data->{items}->[ $id ];
- $item->{_row_id} ||= $id;
+ my $row = $data->{items}->[ $id ];
+ 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);
+ }
+ }
+ $row->{_row_id} ||= $id;
+ push @$sorted_items, $row;
}
warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit order $sort";
rows => $#$filtered + 1,
numeric => { map { $_, $self->_is_numeric($_) } @columns },
filters => $self->_current_filters,
+ code => $code,
+ cols_changed => $cols_changed,
);
}
);
}
+
+sub __invalidate_path_column {
+ my ( $path, $name ) = @_;
+
+ if ( defined $loaded->{$path}->{sorted}->{$name} ) {
+ delete $loaded->{$path}->{sorted}->{$name};
+ warn "# invalidate $path sorted $name\n";
+ }
+
+ foreach ( grep { m/$name/ } keys %{ $loaded->{$path}->{filtered} } ) {
+ delete $loaded->{$path}->{filtered}->{$_};
+ warn "# invalidate $path filtered $_\n";
+ }
+}
+
+sub __path_modified {
+ my ( $path, $value ) = @_;
+ $value = 1 unless defined $value;
+
+ $loaded->{$path}->{modified} = $value;
+
+ warn "# __path_modified $path $value\n";
+}
+
sub edit {
my $self = shift;
my $new_content = $self->param('new_content');
warn "# change $path $i $old -> $new\n";
$loaded->{$path}->{data}->{items}->[$i]->{$name} = $v;
- if ( defined $loaded->{$path}->{sorted}->{$name} ) {
- delete $loaded->{$path}->{sorted}->{$name};
- warn "# invalidate $path sorted $name\n";
- }
-
- foreach ( grep { m/$name/ } keys %{ $loaded->{$path}->{filtered} } ) {
- delete $loaded->{$path}->{filtered}->{$_};
- warn "# invalidate $path filtered $_\n";
- }
+ __invalidate_path_column( $path, $name );
$status = 201; # created
# modified = 2 -- force rebuild of stats
- $loaded->{$path}->{modified} = 2;
- $self->session( 'modified' => 2 );
+ __path_modified( $path, 2 );
$new_content = join("\xB6",@$v);
my $self = shift;
my $path = $self->_param_or_session('path');
my $dump_path = $self->_save( $path );
- $loaded->{$path}->{modified} = 0;
- $self->session( 'modified' => 0 );
+ __path_modified( $path, 0 );
$self->redirect_to( '/data/items' );
}
if ( my $import = $self->param('import') ) {
- if ( $import =~ m{/filter\.(\w+)\.} ) {
+ if ( $import =~ m{/filter\.(.+?)\..+} ) {
my $name = $1;
my @vals = map { chomp; $_ }
read_file $self->app->home->rel_dir('public') . "/export/$import";
-warn dump(@vals);
$self->_remove_filter( $name );
$self->_filter_on_data( $name, @vals );
$self->session( 'offset' => 0 );
projects / MojoFacets.git / blobdiff