Removed caching from www_export() Fixes bug #12050.

This commit is contained in:
Mary Hoerr 2011-03-10 16:28:48 -06:00 committed by root
parent 88797c1d6c
commit ee40a71770
2 changed files with 13 additions and 13 deletions

View file

@ -5,6 +5,7 @@
- added: Caching to StockData and WeatherData asset.
- added: LastModifiedBy macro
- added: Group Manager form control
- fixed #12050: Thing query caching #1
7.10.11
- fixed #12057: WebGUI::Search, assetIds search clause

View file

@ -2746,20 +2746,19 @@ sub www_exportThing {
$fields = $session->db->read('select * from Thingy_fields where assetId =? and thingId = ? order by sequenceNumber',
[$self->get("assetId"),$thingId]);
while (my $field = $fields->hashRef) {
if ($field->{displayInSearch}){
push(@fields, {
fieldId => $field->{fieldId},
properties => $field,
});
push(@fieldLabels,$field->{label});
}
push(@fields, {
fieldId => $field->{fieldId},
properties => $field,
});
push(@fieldLabels,$field->{label});
}
my @metaDataFields = ('thingDataId','dateCreated','createdById','updatedById','updatedByName','lastUpdated','ipAddress');
if ($thingProperties->{exportMetaData}){
push(@fieldLabels,@metaDataFields)
}
$query = WebGUI::Cache->new($self->session,"query_".$thingId)->get;
$query = 'select * from '.$session->db->dbh->quote_identifier("Thingy_".$thingId);
$sth = $session->db->read($query);
### Loop through the returned structure and put it through Text::CSV
@ -2780,11 +2779,11 @@ sub www_exportThing {
my $value = $self->getFieldValue($data->{"field_".$fieldId},$field->{properties},"%y-%m-%d","%y-%m-%d %j:%n:%s");
push(@fieldValues, $value);
}
if ($thingProperties->{exportMetaData}) {
foreach my $metaDataField (@metaDataFields){
push(@fieldValues,$data->{$metaDataField});
}
}
if ($thingProperties->{exportMetaData}) {
push(@fieldValues, @{$data}{@metaDataFields});
}
print $CSV "\n".WebGUI::Text::joinCSV( @fieldValues );
#if (! ++$rowCounter % 25) {
$pb->update($i18n->get('Writing data'));