From 2b53c44078d50732922110457c903c2926a0d2b5 Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Tue, 22 Jun 2010 22:29:26 +0200
Subject: [PATCH] unac export paths

---
 Makefile.PL               | 1 +
 lib/MojoFacets/Data.pm    | 5 +++--
 lib/MojoFacets/Gnuplot.pm | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 34a5af7..af9b23d 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -21,6 +21,7 @@ WriteMakefile(
 		'JSON' => 0,
 		'HTML::TableExtract' => 0,
 		'File::Path' => 0,
+		'Text::Unaccent::PurePerl' => 0,
 	},
     test => {TESTS => 't/*.t t/*/*.t t/*/*/*.t'}
 );
diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index a8dc773..a650988 100644
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -13,6 +13,7 @@ use File::Find;
 use Storable;
 use Time::HiRes qw(time);
 use File::Path qw(mkpath);
+use Text::Unaccent::PurePerl;
 
 use MojoFacets::Import::File;
 use MojoFacets::Import::HTMLTable;
@@ -325,7 +326,7 @@ sub _export_path {
 	}
 	my $dir = $self->app->home->rel_dir('public') . "/export/$path";
 	mkpath $dir unless -e $dir;
-	$dir . '/' . join('.', @_);
+	$dir . '/' . unac_string( join('.', @_) );
 }
 
 sub columns {
@@ -740,7 +741,7 @@ sub items {
 	}
 
 	if ( $self->param('export') ) {
-		my $export_path = "public/export/$path/" . join('.', @columns);
+		my $export_path = $self->_export_path( 'items', @columns);
 		open(my $fh, '>', $export_path) || warn "ERROR: can't open $export_path: $!";
 		foreach my $f ( 0 .. $#$filtered ) {
 			print $fh join("\t", map {
diff --git a/lib/MojoFacets/Gnuplot.pm b/lib/MojoFacets/Gnuplot.pm
index a33e82f..47c721f 100644
--- a/lib/MojoFacets/Gnuplot.pm
+++ b/lib/MojoFacets/Gnuplot.pm
@@ -7,13 +7,14 @@ use base 'Mojolicious::Controller';
 
 use Data::Dump qw(dump);
 use Digest::MD5 qw(md5_hex);
+use Text::Unaccent::PurePerl;
 
 sub index {
 	my $self = shift;
 
 	my $columns = $self->session('columns') || $self->redirect_to('/data/columns');
 
-	my $url = '/export/' . $self->session('path') . '/' . join('.', @$columns);
+	my $url = '/export/' . $self->session('path') . '/' . unac_string( join('.', 'items', @$columns) );
 	my $dir = $self->app->home->rel_dir('public');
 
 	if ( -e "$dir/$url" ) {
-- 
2.20.1