diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index 9fc7de15a..61ce57014 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -327,9 +327,9 @@ sub getListTemplateVars { #$var->{"entryId"} = $self->getId; #$var->{"delete.url"} = $self->getUrl.";func=deleteAllEntries"; #$var->{"delete.label"} = WebGUI::International::get(91,"Asset_DataForm"); - my $a = WebGUI::SQL->read("select DataForm_fieldId,name,label,isMailField,type from DataForm_field - where assetId=".quote($self->getId)." order by sequenceNumber"); - while (my $field = $a->hashRef) { + my $fields = WebGUI::SQL->read("select DataForm_fieldId,name,label,isMailField,type from DataForm_field + where assetId=".quote($self->getId)." order by sequenceNumber"); + while (my $field = $fields->hashRef) { push(@fieldLoop,{ "field.name"=>$field->{name}, "field.id"=>$field->{DataForm_fieldId}, @@ -338,17 +338,17 @@ sub getListTemplateVars { "field.type"=>$field->{type}, }); } - $a->finish; + $fields->finish; $var->{field_loop} = \@fieldLoop; my @recordLoop; - $a = WebGUI::SQL->read("select ipAddress,username,userid,submissionDate,DataForm_entryId from DataForm_entry + $entries = WebGUI::SQL->read("select ipAddress,username,userid,submissionDate,DataForm_entryId from DataForm_entry where assetId=".quote($self->getId)." order by submissionDate desc"); - while (my $record = $a->hashRef) { + while (my $record = $entries->hashRef) { my @dataLoop; - my $b = WebGUI::SQL->read("select b.name, b.label, b.isMailField, a.value from DataForm_entryData a left join DataForm_field b + my $dloop = WebGUI::SQL->read("select b.name, b.label, b.isMailField, a.value from DataForm_entryData a left join DataForm_field b on a.DataForm_fieldId=b.DataForm_fieldId where a.DataForm_entryId=".quote($record->{DataForm_entryId})." order by b.sequenceNumber"); - while (my $data = $b->hashRef) { + while (my $data = $dloop->hashRef) { push(@dataLoop,{ "record.data.name"=>$data->{name}, "record.data.label"=>$data->{label}, @@ -356,7 +356,7 @@ sub getListTemplateVars { "record.data.isMailField"=>$data->{isMailField} }); } - $b->finish; + $dloop->finish; push(@recordLoop,{ "record.ipAddress"=>$record->{ipAddress}, "record.edit.url"=>$self->getUrl("func=view;entryId=".$record->{DataForm_entryId}), @@ -371,7 +371,7 @@ sub getListTemplateVars { "record.data_loop"=>\@dataLoop }); } - $a->finish; + $entries->finish; $var->{record_loop} = \@recordLoop; return $var; } @@ -709,7 +709,7 @@ sub www_deleteAllEntries { sub www_deleteAllEntriesConfirm { my $self = shift; return WebGUI::Privilege::insufficient() unless ($self->canEdit && $session{form}{entryId}==$self->getId); - my $a = WebGUI::SQL->write("delete from DataForm_entry where assetId=".quote($self->getId)); + WebGUI::SQL->write("delete from DataForm_entry where assetId=".quote($self->getId)); return $self->www_view; } diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index 25a6807e9..be1c5f1a9 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -130,7 +130,7 @@ sub definition { #------------------------------------------------------------------- sub duplicate { - my ($self, $newAsset, $newSurveyId, $qdata, $adata, $rdata, $a, $b, $c, $s, $sdata, $oldSectionId); + my ($self, $newAsset, $newSurveyId, $qdata, $adata, $rdata, $sdata, $oldSectionId); $self = shift; @@ -140,45 +140,45 @@ sub duplicate { Survey_id=>$newSurveyId }); - $s = WebGUI::SQL->read("select * from Survey_section where Survey_id=".quote($self->get("Survey_id")) - ." order by sequenceNumber"); - while ($sdata = $s->hashRef) { + my $section = WebGUI::SQL->read("select * from Survey_section where Survey_id=".quote($self->get("Survey_id")) + ." order by sequenceNumber"); + while ($sdata = $section->hashRef) { $oldSectionId = $sdata->{Survey_sectionId}; $sdata->{Survey_sectionId} = "new"; $sdata->{Survey_Id} = $newSurveyId; $sdata->{Survey_sectionId} = $newAsset->setCollateral("Survey_section", "Survey_sectionId",$sdata,1,0, "Survey_id"); - $a = WebGUI::SQL->read("select * from Survey_question where Survey_id=".quote($self->get("Survey_id")) - ." and Survey_sectionId=".quote($oldSectionId)." order by sequenceNumber"); - while ($qdata = $a->hashRef) { - $b = WebGUI::SQL->read("select * from Survey_answer where Survey_questionId=".quote($qdata->{Survey_questionId}) + my $questions = WebGUI::SQL->read("select * from Survey_question where Survey_id=".quote($self->get("Survey_id")) + ." and Survey_sectionId=".quote($oldSectionId)." order by sequenceNumber"); + while ($qdata = $questions->hashRef) { + my $answers = WebGUI::SQL->read("select * from Survey_answer where Survey_questionId=".quote($qdata->{Survey_questionId}) ." order by sequenceNumber"); $qdata->{Survey_questionId} = "new"; $qdata->{Survey_id} = $newSurveyId; $qdata->{Survey_sectionId} = $sdata->{Survey_sectionId}; $qdata->{Survey_questionId} = $newAsset->setCollateral("Survey_question","Survey_questionId",$qdata,1,0,"Survey_id"); - while ($adata = $b->hashRef) { - $c = WebGUI::SQL->read("select * from Survey_questionResponse where Survey_answerId=".quote($adata->{Survey_answerId})); + while ($adata = $answers->hashRef) { + $responses = WebGUI::SQL->read("select * from Survey_questionResponse where Survey_answerId=".quote($adata->{Survey_answerId})); $adata->{Survey_answerId} = "new"; $adata->{Survey_questionId} = $qdata->{Survey_questionId}; $adata->{Survey_id} = $newSurveyId; $adata->{Survey_answerId} = $newAsset->setCollateral("Survey_answer", "Survey_answerId", $adata, 1, 0, "Survey_Id"); - while ($rdata = $c->hashRef) { + while ($rdata = $responses->hashRef) { $rdata->{Survey_responseId} = "new"; $rdata->{Survey_answerId} = $adata->{Survey_answerId}; $rdata->{Survey_id} = $newSurveyId; $rdata->{Survey_questionId} = $qdata->{Survey_questionId}; $newAsset->setCollateral("Survey_response","Survey_responseId",$rdata,0,0); } - $c->finish; + $responses->finish; } - $b->finish; + $answers->finish; } - $a->finish; + $questions->finish; } - $s->finish; + $section->finish; return $newAsset; } @@ -1309,10 +1309,10 @@ sub www_viewIndividualSurvey { $var->{'answer.label'} = WebGUI::International::get(19,'Asset_Survey'); $var->{'response.label'} = WebGUI::International::get(66,'Asset_Survey'); $var->{'comment.label'} = WebGUI::International::get(57,'Asset_Survey'); - my $a = WebGUI::SQL->read("select Survey_questionId,question,answerFieldType from Survey_question + my $questions = WebGUI::SQL->read("select Survey_questionId,question,answerFieldType from Survey_question where Survey_id=".quote($self->get("Survey_id"))." order by sequenceNumber"); my @questionloop; - while (my $qdata = $a->hashRef) { + while (my $qdata = $questions->hashRef) { my @aid; my @answer; if ($qdata->{answerFieldType} eq "radioList") { @@ -1336,7 +1336,7 @@ sub www_viewIndividualSurvey { 'question.answer' => join(", ",@answer), }); } - $a->finish; + $questions->finish; $var->{question_loop} = \@questionloop; return WebGUI::Style::process($self->processTemplate($var, $self->getValue("responseTemplateId")),$self->getValue("styleTemplateId")); # return $self->processTemplate($self->getValue("responseTemplateId"),$var,"Survey/Response");