rel_dir is replaced with rel_file

[MojoFacets.git] / lib / MojoFacets / Data.pm

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 513adbe..cd78d26 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -17,7 +17,7 @@ use File::Find;
 use Storable;
 use Time::HiRes qw(time);
 use File::Path qw(mkpath);
-use Text::Unaccent;
+use Text::Unaccent::PurePerl;
 use Digest::MD5;
 use Statistics::Descriptive;
 
@@ -61,7 +61,7 @@ our $filters;
 sub index {
        my $self = shift;
 
-       my $data_dir = $self->app->home->rel_dir('data');
+       my $data_dir = $self->app->home->rel_file('data');
        die "no data dir $data_dir" unless -d $data_dir;
 
        my @files;
@@ -69,7 +69,7 @@ sub index {
 
        find( sub {
                my $file = $File::Find::name;
-               if ( -f $file && $file =~ m/([^\/]+)\.changes\/(\d+\.\d+.+)/ ) {
+               if ( -f $file && $file =~ m/([^\/]+)\.changes\/(\d+[\.,]\d+.+)/ ) {
                        push @{ $changes->{$1} }, $2
                } elsif ( import_module( $file ) ) {
                        $file =~ s/$data_dir\/*//;
@@ -98,7 +98,7 @@ sub index {
 
 sub _dump_path {
        my ( $self, $name ) = @_;
-       my $dir = $self->app->home->rel_dir('data');
+       my $dir = $self->app->home->rel_file('data');
        $name =~ s/^$dir//;
        $name =~ s/\/+/_/g;
        return '/tmp/mojo_facets.' . $name . '.storable';
@@ -357,7 +357,7 @@ sub _checked {
 sub _permanent_path {
        my $self = shift;
        my $path = $self->_param_or_session('path');
-       $self->app->home->rel_dir('data') . '/' . join('.', $path, @_);
+       $self->app->home->rel_file('data') . '/' . join('.', $path, @_);
 }
 
 sub __unac {
@@ -383,7 +383,7 @@ sub _export_path {
                warn "no path in param or session";
                return;
        }
-       my $dir = $self->app->home->rel_dir('public') . "/export/$path";
+       my $dir = $self->app->home->rel_file('public') . "/export/$path";
        mkpath $dir unless -e $dir;
        my $name = __export_path_name( $path, @_ );
        my $full = $dir . '/' . $name;
@@ -815,7 +815,7 @@ sub items {
        $code =~ s{\n+$}{\n}s;
 
        # XXX convert @row->{foo} into @{$row->{foo}}
-       $code =~ s|\@(row->{[^}]+})|\@{\$$1}|gs;
+       $code =~ s|\@(row->\{[^}]+\})|\@{\$$1}|gs;
 
        my $commit = $self->param('commit');
        my $test = $self->param('test');
@@ -826,7 +826,7 @@ sub items {
        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$//;
                        }
@@ -835,7 +835,7 @@ sub items {
                }
        }
 
-       my $code_path = $self->app->home->rel_dir('public') . "/code";
+       my $code_path = $self->app->home->rel_file('public') . "/code";
        if ( $commit ) {
 
                __path_modified( $path, 'commit' );
@@ -992,7 +992,7 @@ sub items {
                warn "# sorted_items ", $#$sorted_items + 1, " offset $offset limit $limit order $sort";
 
                my $depends_on;
-               my $tmp = $code; $tmp =~ s/\$row->{(['"]?)([\w\s]+)\1/$depends_on->{$2}++/gse;
+               my $tmp = $code; $tmp =~ s/\$row->\{(['"]?)([\w\s]+)\1/$depends_on->{$2}++/gse;
                warn "# depends_on ",dump $depends_on;
 
                my $test_added = Storable::dclone $test_changed;
@@ -1295,7 +1295,7 @@ sub save {
 sub export {
        my $self = shift;
 
-       my $dir = $self->app->home->rel_dir('public');
+       my $dir = $self->app->home->rel_file('public');
 
        if ( my $import = $self->param('import') ) {