oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated AssetExportHtml and tests. Now to re-order the export.

Browse source
This commit is contained in:
Doug Bell 2007-02-01 16:57:05 +00:00
parent 53f73fcf45
commit af66fa585c
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/WebGUI/AssetExportHtml.pm
View file

@ -107,9 +107,15 @@ sub _exportAsHtml {
endingLineageLength => $newSelf->getLineageLength+$self->session->form->process("depth") endingLineageLength => $newSelf->getLineageLength+$self->session->form->process("depth")
}); });
$tempSession->var->end;
$tempSession->close;
# We're going to walk up the URL branch, making the deepest paths first # We're going to walk up the URL branch, making the deepest paths first
foreach my $assetId (@{$assetIds}) { foreach my $assetId (@{$assetIds}) {
my $asset = WebGUI::Asset->newByDynamicClass($tempSession, $assetId); my $assetSession
= WebGUI::Session->open($self->session->config->getWebguiRoot, $self->session->config->getFilename);
$assetSession->user({userId=>$userId});
my $asset = WebGUI::Asset->newByDynamicClass($assetSession, $assetId);
my $url = $asset->get("url"); my $url = $asset->get("url");
$self->session->output->print(sprintf($i18n->get('exporting page'), $url)) unless $quiet; $self->session->output->print(sprintf($i18n->get('exporting page'), $url)) unless $quiet;
@ -158,10 +164,6 @@ sub _exportAsHtml {
$assetSession->close; $assetSession->close;
$self->session->output->print($i18n->get('done')) unless $quiet; $self->session->output->print($i18n->get('done')) unless $quiet;
} }
# We're done with the export sessions
$tempSession->var->end;
$tempSession->close;
if ($extrasUploadsAction eq 'symlink') { if ($extrasUploadsAction eq 'symlink') {
@ -231,6 +233,9 @@ sub _translateUrlToPath {
my $index = shift; my $index = shift;
my $dataRef; my $dataRef;
# Ignore trailing slashes
$url =~ s{/+$}{}g;
# If there is not a dot in the URL, this is easy # If there is not a dot in the URL, this is easy
if ($url !~ m{[.]}) { if ($url !~ m{[.]}) {
$dataRef->{'path' } = $url; $dataRef->{'path' } = $url;
@ -239,7 +244,7 @@ sub _translateUrlToPath {
# There is a dot # There is a dot
else { else {
# The last part after a slash is the "name" # The last part after a slash is the "name"
my ($path,$name) = $url =~ m{(.*) /? ([^/]+) $}x; # NOTE: Might be more efficient to use index() and substr() my ($path,$name) = $url =~ m{(?:(.*) /)? ([^/]+) $}x; # NOTE: Might be more efficient to use index() and substr()
# If it ends in a known file type handled by apache, use that # If it ends in a known file type handled by apache, use that
if ($name =~ m{[.](?:html|htm|txt)$}) { if ($name =~ m{[.](?:html|htm|txt)$}) {

6
t/Asset/AssetExportHtml.t
View file

@ -46,13 +46,13 @@ my $urlMap = {
}, },
'index.html/foo' => { 'index.html/foo' => {
path => 'foo', path => 'index.html/foo',
filename => $index, filename => $index,
}, },
'index.html/foo.html' => { 'index.html/foo.html' => {
path => undef, path => 'index.html',
filename => undef, filename => 'foo.html',
}, },
}; };