From 0b6533222fd1f9d273624622496b849345da9dec Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Wed, 23 Jun 2010 00:15:03 +0200 Subject: [PATCH] even more agressicly script export path --- lib/MojoFacets/Data.pm | 4 +++- lib/MojoFacets/Gnuplot.pm | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm index 69d4349..ac7dc21 100644 --- a/lib/MojoFacets/Data.pm +++ b/lib/MojoFacets/Data.pm @@ -326,7 +326,9 @@ sub _export_path { } my $dir = $self->app->home->rel_dir('public') . "/export/$path"; mkpath $dir unless -e $dir; - $dir . '/' . unac_string( join('.', @_) ); + my $name = unac_string( join('.', @_) ); + $name =~ s/\W+/_/g; + $dir . '/' . $name; } sub columns { diff --git a/lib/MojoFacets/Gnuplot.pm b/lib/MojoFacets/Gnuplot.pm index 7f8ab08..67b484f 100644 --- a/lib/MojoFacets/Gnuplot.pm +++ b/lib/MojoFacets/Gnuplot.pm @@ -14,7 +14,12 @@ sub index { my $columns = $self->session('columns') || $self->redirect_to('/data/columns'); - my $url = '/export/' . $self->session('path') . '/' . unac_string( join('.', 'items', @$columns) ); + my $name = unac_string( join('.', 'items', @$columns) ); + $name =~ s/\W+/_/g; + + warn "# name $name\n"; + + my $url = '/export/' . $self->session('path') . '/' . $name; my $dir = $self->app->home->rel_dir('public'); if ( -e "$dir/$url" ) { -- 2.20.1