From a1033aeaa2a6888d33deb8091f8a3040f7139d68 Mon Sep 17 00:00:00 2001
From: Patrick Donelan <pat@patspam.com>
Date: Tue, 27 Jan 2009 05:47:36 +0000
Subject: [PATCH] Replaced all decode/encode_json method calls with
 to/from_json method calls now that we've licked the Survey encoding bug
 (wrong mysql db field type)

---
 lib/WebGUI/Asset/Wobject/Survey.pm              | 13 +++++--------
 lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm |  4 ++--
 lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm   |  4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index fd78f56a7..18979ea84 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -249,9 +249,6 @@ Saves the survey collateral to the DB
 =cut
 
 sub survey       { return shift->{survey}; }
-sub littleBuddy  { return shift->{survey}; }
-sub allyourbases { return shift->{survey}; }
-sub helpmehelpme { return shift->{survey}; }
 
 sub saveSurveyJSON {
     my $self = shift;
@@ -288,7 +285,7 @@ sub www_submitObjectEdit {
     return $self->session->privilege->insufficient()
         unless ( $self->session->user->isInGroup( $self->get('groupToEditSurvey') ) );
 
-    #    my $ref = @{decode_json($self->session->form->process("data"))};
+    #    my $ref = @{from_json($self->session->form->process("data"))};
     my $responses = $self->session->form->paramsHashRef();
 
     my @address = split /-/, $responses->{id};
@@ -426,7 +423,7 @@ sub www_dragDrop {
     return $self->session->privilege->insufficient()
         unless ( $self->session->user->isInGroup( $self->get('groupToEditSurvey') ) );
 
-    my $p = decode_json( $self->session->form->process("data") );
+    my $p = from_json( $self->session->form->process("data") );
 
     my @tid = split /-/, $p->{target}->{id};
     my @bid = split /-/, $p->{before}->{id};
@@ -583,7 +580,7 @@ sub www_loadSurvey {
         ,gotoTargets => \@gotoTargets,
     };
     $self->session->http->setMimeType('application/json');
-    return encode_json($return);
+    return to_json($return);
 } ## end sub www_loadSurvey
 
 #-------------------------------------------------------------------
@@ -945,7 +942,7 @@ sub surveyEnd {
         }
     }
     #    $self->session->http->setRedirect($url);
-    return encode_json( { "type", "forward", "url", $url } );
+    return to_json( { "type", "forward", "url", $url } );
 } ## end sub surveyEnd
 
 #-------------------------------------------------------------------
@@ -1009,7 +1006,7 @@ sub prepareShowSurveyTemplate {
     my $out = $self->processTemplate( $section, $self->get("surveyQuestionsId") );
 
     $self->session->http->setMimeType('application/json');
-    return encode_json( { "type", "displayquestions", "section", $section, "questions", $questions, "html", $out } );
+    return to_json( { "type", "displayquestions", "section", $section, "questions", $questions, "html", $out } );
 } ## end sub prepareShowSurveyTemplate
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
index 9675df200..7c16258d1 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
@@ -61,7 +61,7 @@ sub new {
     my $json   = shift;
     my $log    = shift;
     my $survey = shift;
-    my $temp = decode_json($json) if defined $json;
+    my $temp = from_json($json) if defined $json;
     my $self   = defined $temp ? $temp : {};
     $self->{survey} = $survey;
     $self->{log}    = $log;
@@ -153,7 +153,7 @@ sub freeze {
     my %temp = %{$self};
     delete $temp{log};
     delete $temp{survey};
-    return encode_json( \%temp );
+    return to_json( \%temp );
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
index fa5b7562a..e001cb7d2 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
@@ -87,7 +87,7 @@ sub new {
 
     # Load json object if given..
     if ($json) {
-        my $decoded_json = decode_json($json);
+        my $decoded_json = from_json($json);
         $self->{sections} = $decoded_json->{sections} if defined $decoded_json->{sections};
         $self->{survey}   = $decoded_json->{survey}   if defined $decoded_json->{survey};
     }
@@ -110,7 +110,7 @@ components of this object.
 
 sub freeze {
     my $self = shift;
-    return encode_json(
+    return to_json(
         {   sections => $self->{sections},
             survey   => $self->{survey},
         }