use Encode;
use locale;
use File::Find;
+use Storable;
+use Time::HiRes qw(time);
our $loaded;
our $filters;
die "no data dir $path" unless -d $path;
my @files;
+ my $changes;
find( sub {
my $file = $File::Find::name;
if ( -f $file && $file =~ m/\.(js(on)?|txt)$/ ) {
$file =~ s/$path\/*//;
push @files, $file;
+ } elsif ( -f $file && $file =~ m/([^\/]+)\.changes\/(\d+\.\d+.+)/ ) {
+ push @{ $changes->{$1} }, $2
} else {
warn "IGNORE: $file\n";
}
my $size;
$size->{$_} = -s "$path/$_" foreach @files;
+ if ( my $save_path = $self->session('save_path') ) {
+ $self->session( 'save_path' => 0 )
+ if ! defined $loaded->{$save_path};
+ }
+
$self->render(
files => [ @files ],
size => $size,
loaded => $loaded,
filters => $filters,
+ dump_path => { map { $_ => $self->_dump_path($_) } @files },
+ changes => $changes,
);
}
-sub _load_path {
+sub _dump_path {
+ my ( $self, $name ) = @_;
+ my $dir = $self->app->home->rel_dir('data');
+ $name =~ s/^$dir//;
+ $name =~ s/\/+/_/g;
+ return '/tmp/mojo_facets.' . $name . '.storable';
+}
+
+sub _save {
my ( $self, $path ) = @_;
- return if defined $loaded->{$path}->{data};
+ my $dump_path = $self->_dump_path( $path );
+ warn "save loaded to $dump_path";
+ my $info = $loaded->{$path};
+ store $info, $dump_path;
+
+ # sync timestamp
+ #my $mtime = $loaded->{$path}->{mtime};
+ #utime $mtime, $mtime, $dump_path;
+
+ warn $dump_path, ' ', -s $dump_path, " bytes\n";
+ return $dump_path;
+}
+
+sub _load_path {
+ my ( $self, $path ) = @_;
my $full_path = $self->app->home->rel_file( 'data/' . $path );
die "$full_path $!" unless -r $full_path;
+ my $dump_path = $self->_dump_path( $path );
+
+ if ( defined $loaded->{$path}->{data} ) {
+ my $mtime = (stat($full_path))[9];
+ return if $loaded->{$path}->{mtime} == $mtime;
+ warn "reload $full_path, modified ", time() - $mtime, " seconds ago\n";
+ } elsif ( -e $dump_path ) {
+ warn "dump_path $dump_path ", -s $dump_path, " bytes loading...\n";
+ my $info = retrieve $dump_path;
+ $loaded->{ $path } = $info;
+ return;
+ }
+
# we could use Mojo::JSON here, but it's too slow
# $data = from_json read_file $path;
my $data = read_file $full_path;
}
}
my $item;
- $item->{ $header[$_] || "f_$_" } = [ $v[$_] ] foreach ( 0 .. $#v );
+ foreach my $i ( 0 .. $#v ) {
+ $item->{ $header[$i] || "f_$i" } = [ $v[$i] ];
+ }
push @{ $data->{items} }, $item;
}
} else {
if $stats->{$n}->{array} == $stats->{$n}->{count};
}
+ if ( ! @header ) {
+ if ( defined $data->{header} ) {
+ if ( ref $data->{header} eq 'ARRAY' ) {
+ @header = @{ $data->{header} };
+ } else {
+ warn "header not array ", dump( $data->{header} );
+ }
+ }
+ }
+
@header =
sort { $stats->{$b}->{count} <=> $stats->{$a}->{count} }
grep { defined $stats->{$_}->{count} } keys %$stats
warn dump($stats);
- $loaded->{ $path } = {
+ my $info = {
header => [ @header ],
stats => $stats,
full_path => $full_path,
size => -s $full_path,
+ mtime => (stat($full_path))[9],
data => $data,
};
+ $loaded->{ $path } = $info;
+ $self->_save( $path );
+
}
sub _loaded {
my ( $self, $name ) = @_;
- my $path = $self->session('path');
- die "$path $name doesn't exist in loaded ",dump( $loaded )
- unless defined $loaded->{$path}->{$name};
+ my $path = $self->session('path') || $self->param('path');
+ $self->redirect_to('/data/index') unless $path;
+ 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};
+ }
return $loaded->{$path}->{$name};
}
my $name = $self->param('filter_name') || die "name?";
my @vals = $self->param('filter_vals');
- my $path = $self->session('path');
-
- if ( @vals ) {
- $self->_filter_on_data( $name, @vals );
- } else {
- warn "# filter - $name\n";
- delete $filters->{$name};
- delete $loaded->{$path}->{filters}->{$name};
- }
-
- #warn "# filters ",dump($filters);
+ $self->_remove_filter( $name );
+ $self->_filter_on_data( $name, @vals ) if @vals;
$self->session( 'offset' => 0 );
#warn "# filter $name ",dump($filtered_items);
$loaded->{$path}->{filters}->{$name} = $filtered_items;
- warn "generated ", scalar keys %$filtered_items, " filtered items\n";
+ warn "filter $name with ", scalar keys %$filtered_items, " items created\n";
}
sub _data_items {
my $path = $self->session('path');
+ warn "_data_sorted_by $order from $path";
+
if ( defined $loaded->{$path}->{sorted}->{$order} ) {
return $loaded->{$path}->{sorted}->{$order};
}
} @{ $data->{items} }
;
- warn "sorted $order"; # ,dump( @sorted );
+ warn "sorted: $order numeric: $numeric items: ", $#sorted + 1, "\n";
+ #warn "# sorted ",dump( @sorted );
$loaded->{$path}->{sorted}->{$order} = [ @sorted ];
}
}
}
- my $path_filters = $loaded->{$path}->{filters};
+ my $all_filters = join(' ',sort @filter_names,'order:',$order);
- my $sort_descending = $sort eq 'd';
+# warn "# all_filters $all_filters ", dump( $loaded->{$path}->{filtered}->{$all_filters} );
- my @filtered;
- foreach my $i ( 0 .. $#$sorted ) {
- my $pos = $sort_descending ? $sorted->[$i] : $sorted->[ $#$sorted - $i ];
+ if ( ! defined $loaded->{$path}->{filtered}->{$all_filters} ) {
- push @filtered, $pos;
- next if $#filter_names == -1;
+ my $path_filters = $loaded->{$path}->{filters};
- my $skip = 0;
- foreach ( @filter_names ) {
- $skip ||= 1 if ! defined $path_filters->{$_}->{$pos};
+ warn "create combined filter for $all_filters\n";
+
+ my @filtered;
+ foreach my $i ( 0 .. $#$sorted ) {
+ my $pos = $sorted->[$i];
+
+ if ( $#filter_names == -1 ) {
+ push @filtered, $pos;
+ next;
+ }
+
+ my $skip = 0;
+ foreach ( @filter_names ) {
+ $skip ||= 1 if ! defined $path_filters->{$_}->{$pos};
+ }
+ next if $skip;
+
+ push @filtered, $pos;
}
- next if $skip;
- push @filtered, $pos;
+ $loaded->{$path}->{filtered}->{$all_filters} = [ @filtered ];
}
+ my $filtered = $loaded->{$path}->{filtered}->{$all_filters}
+ if defined $loaded->{$path}->{filtered}->{$all_filters};
+
+ warn "all_filters $all_filters produced ", $#$filtered + 1, " items\n" if $filtered;
+
my $sorted_items;
my $data = $self->_loaded('data');
- foreach ( $offset .. $offset + $limit ) {
- last unless defined $filtered[$_];
- push @$sorted_items, $data->{items}->[ $filtered[$_] ];
+ 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;
}
-
- warn "# sorted_items ", $#$sorted_items + 1;
+ warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit order $sort";
$self->render(
order => $order,
limit => $limit,
sorted => $sorted_items,
columns => [ @columns ],
- rows => $#filtered + 1,
+ rows => $#$filtered + 1,
numeric => { map { $_, $self->_is_numeric($_) } @columns },
filters => $self->_current_filters,
);
$stats->{$name}->{numeric} > $count / 2;
}
+sub _remove_filter {
+ my ($self,$name) = @_;
+ warn "_remove_filter $name\n";
+
+ my $path = $self->session('path');
+
+ delete $filters->{$name};
+ delete $loaded->{$path}->{filters}->{$name};
+ warn "filters left: ", keys %{ $loaded->{$path}->{filters} };
+
+ foreach (
+ grep { /\b$name\b/ }
+ keys %{ $loaded->{$path}->{filtered} }
+ ) {
+ delete $loaded->{$path}->{filtered}->{$_};
+ warn "remove filtered cache $_";
+ }
+}
+
sub facet {
my $self = shift;
my $path = $self->session('path') || $self->redirect_to( '/data/index' );
- if ( my $remove = $self->param('remove') ) {
- delete $filters->{$remove};
- delete $loaded->{$path}->{filters}->{$remove};
+ if ( my $name = $self->param('remove') ) {
+ $self->_remove_filter( $name );
$self->redirect_to( '/data/items' );
}
my $name = $self->param('name') || die "no name";
my $all = $self->_perm_scalar('all', 1);
+ my $data = $self->_loaded('data');
+
+ my $filters = $self->_current_filters;
+ my $all_filters = join(' ',sort keys %$filters,'order:',$self->session('order'));
+ my $filtered = $loaded->{$path}->{filtered}->{$all_filters}
+ if defined $loaded->{$path}->{filtered}->{$all_filters};
- foreach my $i ( $self->_data_items($all) ) {
- if ( ! exists $i->{$name} ) {
+ if ( ! $filtered || $all ) {
+ $filtered = [ 0 .. $#{ $data->{items} } ];
+ warn "filter all values\n";
+ } else {
+ warn "filter using $all_filters\n";
+ }
+
+ foreach my $i ( @$filtered ) {
+ my $item = $data->{items}->[$i];
+ if ( ! exists $item->{$name} ) {
$facet->{ _missing }++;
- } elsif ( ref $i->{$name} eq 'ARRAY' ) {
- $facet->{$_}++ foreach @{ $i->{$name} };
+ } elsif ( ref $item->{$name} eq 'ARRAY' ) {
+ $facet->{$_}++ foreach @{ $item->{$name} };
} else {
- $facet->{ $i->{$name} }++;
+ $facet->{ $item->{$name} }++;
}
}
$checked = $self->_checked( @{ $filters->{$name} } ) if defined $filters->{$name};
- my $sort = $self->param('sort') || 'c';
-
- # sort facet numerically if more >50% elements are numeric
my $numeric = $self->_is_numeric($name);
+ my $sort = $self->param('sort');
+ # sort numeric facets with more than 5 values ascending
+ $sort ||= $numeric && $#facet_names > 4 ? 'a' : 'c';
+
@facet_names = sort {
- if ( $sort =~ m/a/i ) {
- $numeric ? $a <=> $b : lc $a cmp lc $b;
- } elsif ( $sort =~ m/d/i ) {
- $numeric ? $b <=> $a : lc $b cmp lc $a;
- } elsif ( $sort =~ m/c/i ) {
- ( $facet->{$b} || -1 ) <=> ( $facet->{$a} || -1 )
+ my $result;
+ if ( $sort eq 'a' ) {
+ $result = $numeric ? $a <=> $b : lc $a cmp lc $b;
+ } elsif ( $sort eq 'd' ) {
+ $result = $numeric ? $b <=> $a : lc $b cmp lc $a;
+ } elsif ( $sort eq 'c' ) {
+ $result = ( $facet->{$b} || -1 ) <=> ( $facet->{$a} || -1 )
} else {
warn "unknown sort: $sort";
- $a cmp $b;
+ $result = $a cmp $b;
}
+ $result = $a cmp $b unless defined $result; # FIXME cludge for numeric facets with invalid data
+ $result;
} @facet_names;
$self->render( name => $name, facet => $facet, checked => $checked,
my $self = shift;
my $content = $self->param('content');
+ my $i = $self->param('_row_id');
+ die "invalid _row_id ",dump($i) unless $i =~ m/^\d+$/;
+ my $path = $self->param('path') || die "no path";
+ my $name = $self->param('name') || die "no name";
+ my $status = 200; # 200 = OK, 201 = Created
+
+ my $data = $self->_loaded('data');
+
+ if ( defined $loaded->{$path}->{data}->{items}->[$i] ) {
+ $content =~ s/^\s+//s;
+ $content =~ s/\s+$//s;
+ my $v;
+ if ( $content =~ /\xB6/ ) { # para
+ $v = [ split(/\s*\xB6\s*/, $content) ];
+ } else {
+ $v = [ $content ];
+ }
+
+ my $old = dump $loaded->{$path}->{data}->{items}->[$i]->{$name};
+ my $new = dump $v;
+ if ( $old ne $new
+ && ! ( $old eq 'undef' && length($content) == 0 ) # new value empty, previous undef
+ ) {
+ my $change = {
+ path => $path,
+ column => $name,
+ pos => $i,
+ old => $loaded->{$path}->{data}->{items}->[$i]->{$name},
+ new => $v,
+ time => $self->param('time') || time(),
+ user => $self->param('user') || $ENV{'LOGNAME'},
+ };
+ my $change_path = $self->app->home->rel_dir('data') . '/' . $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;
+
+ 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";
+ }
+
+ $status = 201; # created
+ $self->session('save_path' => $path);
+
+ } else {
+ warn "# unchanged $path $i $old\n";
+ $status = 304;
+ }
+ } else {
+ $content = "$path $i $name doesn't exist\n";
+ $status = 404;
+ }
+
+ warn "# edit $status $content";
+
$self->render(
- content => $content
+ status => $status,
+ content => $content,
);
}
+
+sub save {
+ my $self = shift;
+ my $path = $self->param('path');
+ $path ||= $self->session('path');
+
+ my $dump_path = $self->_save( $path );
+ $self->session('save_path' => 0);
+
+ $self->redirect_to( '/data/items' );
+}
+
1;
projects / MojoFacets.git / blobdiff