From bd5e08ca9b7fe564f24c2fafb7a58140d74097da Mon Sep 17 00:00:00 2001 From: slothbag Date: Mon, 4 Apr 2016 13:21:08 +1000 Subject: [PATCH] datafieldenc switch statement License: MIT Signed-off-by: slothbag --- core/commands/object/object.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/commands/object/object.go b/core/commands/object/object.go index 3198c5b20..118dcda5f 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -373,7 +373,7 @@ And then run: res.SetError(err, cmds.ErrNormal) return } - + output, err := objectPut(n, input, inputenc, datafieldenc) if err != nil { errType := cmds.ErrNormal @@ -577,10 +577,13 @@ func getOutput(dagnode *dag.Node) (*Object, error) { // converts the Node object into a real dag.Node func deserializeNode(node *Node, dataFieldEncoding string) (*dag.Node, error) { dagnode := new(dag.Node) - if dataFieldEncoding == "text" { + switch dataFieldEncoding { + case "text": dagnode.Data = []byte(node.Data) - } else { + case "base64": dagnode.Data, _ = base64.StdEncoding.DecodeString(node.Data) + default: + return nil, fmt.Errorf("Unkown data field encoding") } dagnode.Links = make([]*dag.Link, len(node.Links))