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

fixed: DataForm times out when exporting large data sets

Browse source
This commit is contained in:
Graham Knop 2008-11-24 04:03:14 +00:00
parent 072ccd2cc6
commit a8614275eb
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -55,6 +55,7 @@
- fixed #8982: Deploy package doesn't take back to asset manager - fixed #8982: Deploy package doesn't take back to asset manager
- fixed #8956: Not checking for populated variable - fixed #8956: Not checking for populated variable
- fixed #9130: fixed: Rich editor creates root <p> tag even when set to use <br /> - fixed #9130: fixed: Rich editor creates root <p> tag even when set to use <br />
- fixed: DataForm times out when exporting large data sets
7.6.3 7.6.3
- improved performance of file uploads - improved performance of file uploads

18
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -15,10 +15,8 @@ http://www.plainblack.com info@plainblack.com
=cut =cut
use strict; use strict;
use Tie::CPHash;
use Tie::IxHash; use Tie::IxHash;
use WebGUI::Form; use WebGUI::Form;
use WebGUI::HTML;
use WebGUI::HTMLForm; use WebGUI::HTMLForm;
use WebGUI::International; use WebGUI::International;
use WebGUI::Mail::Send; use WebGUI::Mail::Send;
@ -26,13 +24,12 @@ use WebGUI::Macro;
use WebGUI::Inbox; use WebGUI::Inbox;
use WebGUI::SQL; use WebGUI::SQL;
use WebGUI::Asset::Wobject; use WebGUI::Asset::Wobject;
use WebGUI::Utility qw(isIn);
use WebGUI::Pluggable; use WebGUI::Pluggable;
use WebGUI::DateTime; use WebGUI::DateTime;
use WebGUI::User; use WebGUI::User;
use WebGUI::Group; use WebGUI::Group;
use WebGUI::AssetCollateral::DataForm::Entry; use WebGUI::AssetCollateral::DataForm::Entry;
use JSON; use JSON ();
our @ISA = qw(WebGUI::Asset::Wobject); our @ISA = qw(WebGUI::Asset::Wobject);
@ -1339,7 +1336,8 @@ sub www_editTabSave {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_exportTab { sub www_exportTab {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient my $session = $self->session;
return $session->privilege->insufficient
unless $self->canEdit; unless $self->canEdit;
my @exportFields; my @exportFields;
for my $field ( map { $self->getFieldConfig($_) } @{$self->getFieldOrder} ) { for my $field ( map { $self->getFieldConfig($_) } @{$self->getFieldOrder} ) {
@ -1356,7 +1354,10 @@ sub www_exportTab {
'submissionDate', 'submissionDate',
@exportFields, @exportFields,
); );
my $outText = $tsv->string;
$session->http->setFilename($self->get("url").".tab","text/plain");
$session->http->sendHeader;
$session->output->print($tsv->string, 1);
my $entryIter = $self->entryClass->iterateAll($self); my $entryIter = $self->entryClass->iterateAll($self);
@ -1370,10 +1371,9 @@ sub www_exportTab {
$entry->submissionDate->webguiDate, $entry->submissionDate->webguiDate,
@{ $entryFields }{@exportFields}, @{ $entryFields }{@exportFields},
); );
$outText .= $tsv->string; $session->output->print($tsv->string, 1);
} }
$self->session->http->setFilename($self->get("url").".tab","text/plain"); return 'chunked';
return $outText;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------