Index: lib/WebGUI/AssetExportHtml.pm
===================================================================
--- lib/WebGUI/AssetExportHtml.pm (revision 2921)
+++ lib/WebGUI/AssetExportHtml.pm (working copy)
@@ -95,8 +95,8 @@
}
my $path;
my $filename;
- if ($url =~ /\./) {
- $url =~ /^(.*)\/(.*)$/;
+ if ($url =~ m{/?[^/]*\.[^/]*$}) {
+ $url =~ m{^(.*?)/?([^/]*)$};
$path = $1;
$filename = $2;
if ($filename eq "") {
@@ -107,13 +107,13 @@
$path = $url;
$filename = $index;
}
- if($path) {
+# if($path) {
$path = $self->session->config->get("exportPath") . "/" . $path;
eval { mkpath($path) };
if($@) {
return "Couldn't create path";
}
- }
+# }
$path .= "/".$filename;
my $file = eval { FileHandle->new(">".$path) or die "$!" };
if ($@) {
@@ -234,8 +234,8 @@
}
my $path;
my $filename;
- if ($url =~ /\./) {
- $url =~ /^(.*)\/(.*)$/;
+ if ($url =~ m{/?[^/]*\.[^/]*$}) {
+ $url =~ m{^(.*?)/?([^/]*)$};
$path = $1;
$filename = $2;
if ($filename eq "") {
@@ -246,15 +246,16 @@
$path = $url;
$filename = $index;
}
- if($path) {
+# if($path) {
$path = $self->session->config->get("exportPath") . "/" . $path;
eval { mkpath($path) };
if($@) {
$self->session->output->print(printf($i18n->get('could not create path'), $path, $@), 1);
return;
}
- }
+# }
$path .= "/".$filename;
+ $self->session->output->print($path);
my $file = eval { FileHandle->new(">".$path) or die "$!" };
if ($@) {
$self->session->output->print(printf($i18n->get('could not open path'), $path, $@),1);