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

Polls now use JSON instead of Storable to store graph info because Storable is not portable between OS/processors.

Browse source
This commit is contained in:
Doug Bell 2007-08-14 17:07:28 +00:00
parent a2e3b54eb7
commit 8b8feb6af3
4 changed files with 128 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

107
lib/WebGUI/Asset/Wobject/Poll.pm
View file

@ -21,7 +21,7 @@ use WebGUI::Utility;
use WebGUI::Asset::Wobject;
use WebGUI::Image::Graph;
use WebGUI::Storage::Image;
use Storable;
use JSON;
our @ISA = qw(WebGUI::Asset::Wobject);
@ -179,6 +179,23 @@ sub duplicate {
return $newAsset;
}
#----------------------------------------------------------------------------
=head2 freezeGraphConfig
Serializes graph configuration. Returns a scalar containing the serialized
structure.
=cut
sub freezeGraphConfig {
my $self = shift;
my $obj = shift;
return JSON::objToJson($obj);
}
#-------------------------------------------------------------------
sub getEditForm {
my $self = shift;
@ -254,10 +271,7 @@ sub getEditForm {
if (WebGUI::Image::Graph->getPluginList($self->session)) {
my $config = {};
if ($self->get('graphConfiguration')) {
$config = Storable::thaw($self->get('graphConfiguration'));
}
my $config = $self->getGraphConfig;
$tabform->addTab('graph', 'Graphing');
$tabform->getTab('graph')->yesNo(
@ -272,6 +286,23 @@ sub getEditForm {
return $tabform;
}
#----------------------------------------------------------------------------
=head2 getGraphConfig
Gets and thaws the graph configuration. Returns a reference to the original
data structure.
=cut
sub getGraphConfig {
my $self = shift;
my $config = $self->get("graphConfiguration");
return unless $config;
return $self->thawGraphConfig($config);
}
#-------------------------------------------------------------------
=head2 indexContent ( )
@ -316,7 +347,7 @@ sub processPropertiesFromFormPost {
if (WebGUI::Image::Graph->getPluginList($self->session)) {
my $graph = WebGUI::Image::Graph->processConfigurationForm($self->session);
$property->{graphConfiguration} = Storable::freeze($graph->getConfiguration);
$self->setGraphConfig( $graph->getConfiguration );
}
$self->update($property);
@ -331,6 +362,23 @@ sub purge {
$self->SUPER::purge();
}
#----------------------------------------------------------------------------
=head2 setGraphConfig
Freezes and stores the configuration for the graphing of this poll.
=cut
sub setGraphConfig {
my $self = shift;
my $obj = shift;
$self->update({
graphConfiguration => $self->freezeGraphConfig($obj),
});
}
#-------------------------------------------------------------------
sub setVote {
my $self = shift;
@ -341,6 +389,21 @@ sub setVote {
".$self->session->db->quote($answer).", ".$self->session->db->quote($userId).", '$ip')");
}
#----------------------------------------------------------------------------
=head2 thawGraphConfig
Deserializes the graph configuration and returns the data structure.
=cut
sub thawGraphConfig {
my $self = shift;
my $string = shift;
return JSON::jsonToObj($string);
}
#-------------------------------------------------------------------
sub view {
my $self = shift;
@ -387,27 +450,23 @@ sub view {
$var{answer_loop} = \@answers;
if ($self->getValue('generateGraph')) {
my $config = {};
if ($self->get('graphConfiguration')) {
$config = Storable::thaw($self->get('graphConfiguration'));
my $config = $self->getGraphConfig;
if ($config) {
my $graph = WebGUI::Image::Graph->loadByConfiguration($self->session, $config);
$graph->addDataset(\@dataset);
$graph->setLabels(\@labels);
if ($config) {
my $graph = WebGUI::Image::Graph->loadByConfiguration($self->session, $config);
$graph->addDataset(\@dataset);
$graph->setLabels(\@labels);
$graph->draw;
$graph->draw;
my $storage = WebGUI::Storage::Image->createTemp($self->session);
my $filename = 'poll'.$self->session->id->generate.".png";
$graph->saveToStorageLocation($storage, $filename);
my $storage = WebGUI::Storage::Image->createTemp($self->session);
my $filename = 'poll'.$self->session->id->generate.".png";
$graph->saveToStorageLocation($storage, $filename);
$var{graphUrl} = $storage->getUrl($filename);
$var{hasImageGraph} = 1;
} else {
$self->session->errorHandler->error('The graph configuration hash of the Poll ('.$self->getUrl.') is corrupt.');
}
}
$var{graphUrl} = $storage->getUrl($filename);
$var{hasImageGraph} = 1;
} else {
$self->session->errorHandler->error('The graph configuration hash of the Poll ('.$self->getUrl.') is corrupt.');
}
}
return $self->processTemplate(\%var,undef,$self->{_viewTemplate});