use Text::Unaccent::PurePerl because other one segfaults

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

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index a2d150b..0f47450 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -5,7 +5,11 @@ use warnings;
 
 use base 'Mojolicious::Controller';
 
-use Data::Dump qw(dump);
+#use Data::Dump qw(dump); # broken with Mojo::JSON, see https://rt.cpan.org/Public/Bug/Display.html?id=86592
+use Data::Dumper;
+use subs 'dump';
+sub dump { Dumper(@_) };
+
 use File::Slurp;
 use Encode;
 use locale;
@@ -13,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;
 
@@ -261,7 +265,7 @@ sub _load_path {
 sub load {
        my $self = shift;
 
-       my @paths = $self->param('paths');
+       my @paths = @{ $self->every_param('paths') };
        warn "# paths ", dump @paths;
 
        foreach my $p ( keys %$loaded ) {
@@ -455,7 +459,7 @@ sub columns {
 sub _param_array {
     my ($self,$name) = @_;
 
-       my @array = $self->param($name);
+       my @array = @{ $self->every_param($name) };
        my $path  = $self->session('path');
 
        if ( @array ) {
@@ -500,7 +504,7 @@ sub filter {
        my $self = shift;
 
        my $name = $self->param('filter_name') || die "name?";
-       my @vals = $self->param('filter_vals');
+       my @vals = @{ $self->every_param('filter_vals') };
 
        $self->_remove_filter( $name );
        if ( @vals ) {
@@ -811,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');
@@ -822,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$//;
                        }
@@ -988,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;