From bdbbd76c9210c7ad3f55b35b2a50db5d98444ed2 Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Tue, 22 Jun 2010 23:05:27 +0200
Subject: [PATCH] remove link added to each export

---
 lib/MojoFacets/Data.pm        | 11 ++++++++++-
 templates/data/export.html.ep | 10 +++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/MojoFacets/Data.pm b/lib/MojoFacets/Data.pm
index 7344f89..2d30a0b 100644
--- a/lib/MojoFacets/Data.pm
+++ b/lib/MojoFacets/Data.pm
@@ -1028,12 +1028,14 @@ sub save {
 sub export {
 	my $self = shift;
 
+	my $dir = $self->app->home->rel_dir('public');
+
 	if ( my $import = $self->param('import') ) {
 
 		if ( $import =~ m{/filter\.(.+?)\..+} ) {
 			my $name = $1;
 			my @vals = map { chomp; $_ }
-				read_file $self->app->home->rel_dir('public') . "/export/$import", binmode => ':utf8';
+				read_file "$dir/export/$import", binmode => ':utf8';
 			$self->_remove_filter( $name );
 			$self->_filter_on_data( $name, @vals );
 			$self->session( 'offset' => 0 );
@@ -1043,6 +1045,13 @@ sub export {
 		}
 	}
 
+	if ( my $remove = $self->param('remove') ) {
+		my $path = "$dir/export/$remove";
+		unlink $path if -e $path;
+		$path .= '.png';
+		unlink $path if -e $path;
+	}
+
 	my @files = grep { ! /\.png$/ } glob( $self->_export_path . '*' );
 	my $mtime = { map { $_ => (stat($_))[9] } @files };
 	@files = sort { $mtime->{$b} <=> $mtime->{$a} } @files;
diff --git a/templates/data/export.html.ep b/templates/data/export.html.ep
index 05812a2..526e6b3 100644
--- a/templates/data/export.html.ep
+++ b/templates/data/export.html.ep
@@ -4,15 +4,19 @@
 % foreach my $e ( @$export ) {
 %  my $path = $e; $path =~ s{^.+/public/export/}{};
 <li>
+<label>
 <tt>
 <a target="<%= $path %>" href="/export/<%= $path %>"><%= $path %></a>
 </tt>
 <%= -s $e %> bytes
-%  if ( -e $e . '.png' ) {
-<br><img src="/export/<%= $path %>.png">
-%  } elsif ( $path =~ m/filter\./ ) {
+<a style="color:red; float: right" href="<%= url_for( action => 'export' )->query( 'remove' => $path ) %>">remove</a>
+%  if ( $path =~ m/filter\./ ) {
 <a href="?import=<%= $path %>">import</a>
 %  }
+</label>
+%  if ( -e $e . '.png' ) {
+<img src="/export/<%= $path %>.png">
+%  }
 % }
 </ul>
 
-- 
2.20.1