aboutsummaryrefslogtreecommitdiffstats
path: root/formats.go
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2012-04-18 23:12:11 -0400
committerbnewbold <bnewbold@robocracy.org>2012-04-18 23:12:11 -0400
commitb6a2d46c5bbdca7ca5d3e50eece732b5b839f2c5 (patch)
tree940c4c41d7585b715c29b7b3dd27e7ccb4e5d6d1 /formats.go
parentb85e202511ea821c773f5eeb305ff71f040fc098 (diff)
downloadbommom-b6a2d46c5bbdca7ca5d3e50eece732b5b839f2c5.tar.gz
bommom-b6a2d46c5bbdca7ca5d3e50eece732b5b839f2c5.zip
bom load versioning
Diffstat (limited to 'formats.go')
-rw-r--r--formats.go17
1 files changed, 12 insertions, 5 deletions
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 -----------------------