From b6a2d46c5bbdca7ca5d3e50eece732b5b839f2c5 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Wed, 18 Apr 2012 23:12:11 -0400
Subject: bom load versioning

---
 formats.go | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'formats.go')

diff --git a/formats.go b/formats.go
index 2412a13..5d93f80 100644
--- a/formats.go
+++ b/formats.go
@@ -96,19 +96,26 @@ func DumpBomAsJSON(bs *BomStub, b *Bom, out io.Writer) {
 
 func LoadBomFromJSON(input io.Reader) (*BomStub, *Bom, error) {
 
-    bs := BomStub{}
-    b := Bom{}
+    bs := &BomStub{}
+    b := &Bom{}
 
 	obj := map[string]interface{}{
-		"bom_meta": bs,
-		"bom":      b,
+		"bom_meta": &bs,
+		"bom":      &b,
 	}
 
+    fmt.Println(obj)
+
 	enc := json.NewDecoder(input)
 	if err := enc.Decode(&obj); err != nil {
 		log.Fatal(err)
 	}
-    return &bs, &b, nil
+    if &bs == nil || &b == nil {
+        log.Fatal("didn't load successfully")
+    }
+    fmt.Println(bs)
+    fmt.Println(b)
+    return bs, b, nil
 }
 
 // --------------------- XML -----------------------
-- 
cgit v1.2.3