always use binmode => ':utf8' with File::Slurp

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

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index b5a74a6..a8dc773 100644 (file)
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -252,7 +252,7 @@ sub load {
        if ( ! defined $loaded->{$path}->{columns} ) {
                my $columns_path = $self->_permanent_path( 'columns' );
                if ( -e $columns_path ) {
-                       my @columns = map { s/[\r\n]+$//; $_ } read_file $columns_path;
+                       my @columns = map { s/[\r\n]+$//; $_ } read_file $columns_path, binmode => ':utf8';
                        $loaded->{$path}->{columns} = [ @columns ];
                        warn "# columns_path $columns_path ",dump(@columns);
                } else {
@@ -333,7 +333,7 @@ sub columns {
 
        if ( $self->param('columns') ) {
                my @columns = $self->_param_array('columns');
-               write_file( $self->_permanent_path( 'columns' ), map { "$_\n" } @columns );
+               write_file( $self->_permanent_path( 'columns' ), { binmode => ':utf8' }, map { "$_\n" } @columns );
                $self->redirect_to('/data/items');
        }
 
@@ -406,7 +406,7 @@ sub filter {
                $self->_filter_on_data( $name, @vals );
                if ( my $permanent = $self->param('_permanent') ) {
                        my $permanent_path = $self->_export_path( 'filter', $name, $permanent );
-                       write_file $permanent_path, map { "$_\n" } @vals;
+                       write_file $permanent_path, { binmode => ':utf8' }, map { "$_\n" } @vals;
                        warn "permanent filter $permanent_path ", -s $permanent_path;
                }
        }
@@ -739,20 +739,22 @@ sub items {
                push @$sorted_items, $row;
        }
 
-       my $export_path = "public/export/$path/" . join('.', @columns);
-       open(my $fh, '>', $export_path) || warn "ERROR: can't open $export_path: $!";
-       foreach my $f ( 0 .. $#$filtered ) {
-               print $fh join("\t", map {
-                       my $i = $data->{items}->[ $filtered->[$f] ];
-                       if ( ref $i->{$_} eq 'ARRAY' ) {
-                               join(',', @{ $i->{$_} });
-                       } else {
-                               dump $i->{$_};
-                       }
-               } @columns),"\n";
+       if ( $self->param('export') ) {
+               my $export_path = "public/export/$path/" . join('.', @columns);
+               open(my $fh, '>', $export_path) || warn "ERROR: can't open $export_path: $!";
+               foreach my $f ( 0 .. $#$filtered ) {
+                       print $fh join("\t", map {
+                               my $i = $data->{items}->[ $filtered->[$f] ];
+                               if ( ref $i->{$_} eq 'ARRAY' ) {
+                                       join(',', @{ $i->{$_} });
+                               } else {
+                                       dump $i->{$_};
+                               }
+                       } @columns),"\n";
+               }
+               close($fh);
+               warn "export $export_path ", -s $export_path, " bytes\n";
        }
-       close($fh);
-       warn "$export_path ", -s $export_path, " bytes\n";
 
        warn "# test_changed ",dump( $test_changed );
        my $c = { map { $_ => 1 } @columns };
@@ -1030,7 +1032,7 @@ sub export {
                if ( $import =~ m{/filter\.(.+?)\..+} ) {
                        my $name = $1;
                        my @vals = map { chomp; $_ }
-                               read_file $self->app->home->rel_dir('public') . "/export/$import";
+                               read_file $self->app->home->rel_dir('public') . "/export/$import", binmode => ':utf8';
                        $self->_remove_filter( $name );
                        $self->_filter_on_data( $name, @vals );
                        $self->session( 'offset' => 0 );