aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2012-04-22 20:46:20 -0400
committerbnewbold <bnewbold@robocracy.org>2012-04-22 20:46:20 -0400
commit133cb72c60578ccf10169686bcff543025e3d8ed (patch)
tree4ad73c47dd2071bea65685eaae90337be611c463
parent5725df43b3bd8f22d450729147099eb4a29674dc (diff)
downloadbommom-133cb72c60578ccf10169686bcff543025e3d8ed.zip
bommom-133cb72c60578ccf10169686bcff543025e3d8ed.tar.gz
gofmt catch up
-rw-r--r--bommom.go6
-rw-r--r--core.go20
-rw-r--r--formats.go170
-rw-r--r--store.go4
4 files changed, 100 insertions, 100 deletions
diff --git a/bommom.go b/bommom.go
index 11b47c4..4f665f6 100644
--- a/bommom.go
+++ b/bommom.go
@@ -234,13 +234,13 @@ func loadCmd() {
bm.Name = bomName
b.Progeny = "File import from " + inFname + " (" + inFormat + ")"
b.Created = time.Now()
- b.Version = version
+ b.Version = version
openBomStore()
if err := bomstore.Persist(bm, b, ShortName(version)); err != nil {
- log.Fatal(err)
- }
+ log.Fatal(err)
+ }
}
func convertCmd() {
diff --git a/core.go b/core.go
index a4fab01..4594d2b 100644
--- a/core.go
+++ b/core.go
@@ -19,16 +19,16 @@ type Offer struct {
}
type LineItem struct {
- Manufacturer string `json:"manufacturer"`
- Mpn string `json:"mpn"`
- Function string `json:"function"`
- FormFactor string `json:"form_factor"` // type:string
- Specs string `json:"specs"` // comma seperated list
- Comment string `json:"comment"`
- Tag string `json:"tag"` // comma seperated list
- Category string `json:"category"` // hierarchy as comma seperated list
- Elements []string `json:"elements"`
- Offers []Offer `json:"offers"`
+ Manufacturer string `json:"manufacturer"`
+ Mpn string `json:"mpn"`
+ Function string `json:"function"`
+ FormFactor string `json:"form_factor"` // type:string
+ Specs string `json:"specs"` // comma seperated list
+ Comment string `json:"comment"`
+ Tag string `json:"tag"` // comma seperated list
+ Category string `json:"category"` // hierarchy as comma seperated list
+ Elements []string `json:"elements"`
+ Offers []Offer `json:"offers"`
}
func (li *LineItem) Id() string {
diff --git a/formats.go b/formats.go
index ab4f5a2..e7f1f8b 100644
--- a/formats.go
+++ b/formats.go
@@ -9,9 +9,9 @@ import (
"fmt"
"io"
"log"
+ "strconv"
"strings"
- "strconv"
- "text/tabwriter"
+ "text/tabwriter"
)
// This compound container struct is useful for serializing to XML and JSON
@@ -38,7 +38,7 @@ func DumpBomAsText(bm *BomMeta, b *Bom, out io.Writer) {
fmt.Fprintf(out, "Description:\t%s\n", bm.Description)
}
fmt.Println()
- tabWriter := tabwriter.NewWriter(out, 2, 4, 1, ' ', 0)
+ tabWriter := tabwriter.NewWriter(out, 2, 4, 1, ' ', 0)
// "by line item", not "by element"
fmt.Fprintf(tabWriter, "qty\ttag\tmanufacturer\tmpn\t\tfunction\t\tcomment\n")
for _, li := range b.LineItems {
@@ -50,7 +50,7 @@ func DumpBomAsText(bm *BomMeta, b *Bom, out io.Writer) {
li.Function,
li.Comment)
}
- tabWriter.Flush()
+ tabWriter.Flush()
}
// --------------------- csv -----------------------
@@ -85,90 +85,90 @@ func DumpBomAsCSV(b *Bom, out io.Writer) {
}
func appendField(existing, next *string) {
- if *existing == "" {
- *existing += " " + strings.TrimSpace(*next)
- }
- *existing = strings.TrimSpace(*next)
+ if *existing == "" {
+ *existing += " " + strings.TrimSpace(*next)
+ }
+ *existing = strings.TrimSpace(*next)
}
func LoadBomFromCSV(input io.Reader) (*Bom, error) {
- b := Bom{LineItems: []LineItem{} }
- reader := csv.NewReader(input)
- reader.TrailingComma = true
- reader.TrimLeadingSpace = true
-
- header, err := reader.Read()
- if err != nil {
- log.Fatal(err)
- }
- var li *LineItem
- var el_count int
- var records []string
- var qty string
- for records, err = reader.Read(); err == nil; records, err = reader.Read() {
- qty = ""
- li = &LineItem{Elements: []string{}}
- for i, col := range header {
- switch strings.ToLower(col) {
- case "qty", "quantity":
- // if a quantity is specified, use it; else interpret it
- // from element id count
- appendField(&qty, &records[i])
- case "mpn", "manufacturer part number":
- appendField(&li.Mpn, &records[i])
- case "mfg", "manufacturer":
- appendField(&li.Manufacturer, &records[i])
- case "element", "id", "circuit element", "symbol_id", "symbol id":
- for _, symb := range strings.Split(records[i], ",") {
- symb = strings.TrimSpace(symb)
- if !isShortName(symb) {
- li.Elements = append(li.Elements, symb)
- } else if *verbose {
- log.Println("symbol not a ShortName, skipped: " + symb)
- }
- }
- case "function", "purpose", "role", "subsystem":
- appendField(&li.Function, &records[i])
- case "formfactor", "form_factor", "form factor", "case/package", "package", "symbol", "footprint":
- appendField(&li.FormFactor, &records[i])
- case "specs", "specifications", "properties", "attributes", "value", "type":
- appendField(&li.Specs, &records[i])
- case "comment", "comments", "note", "notes":
- appendField(&li.Comment, &records[i])
- case "category":
- appendField(&li.Category, &records[i])
- case "tag":
- appendField(&li.Tag, &records[i])
- default:
- // pass, no assignment
- // TODO: should warn on this first time around?
- }
- }
- if qty != "" {
- if n, err := strconv.Atoi(qty); err == nil && n >= 0 {
- el_count = len(li.Elements)
- // XXX: kludge
- if n > 99999 || el_count > 99999 {
- log.Fatal("too large a quantity of elements passed, crashing")
- } else if el_count > n {
- if *verbose {
- log.Println("more symbols than qty, taking all symbols")
- }
- } else if el_count < n {
- for j := 0; j < (n - el_count); j++ {
- li.Elements = append(li.Elements, "")
- }
- }
- }
- }
- if len(li.Elements) == 0 {
- li.Elements = []string{"", }
- }
- b.LineItems = append(b.LineItems, *li)
- }
- if err.Error() != "EOF" {
- log.Fatal(err)
- }
+ b := Bom{LineItems: []LineItem{}}
+ reader := csv.NewReader(input)
+ reader.TrailingComma = true
+ reader.TrimLeadingSpace = true
+
+ header, err := reader.Read()
+ if err != nil {
+ log.Fatal(err)
+ }
+ var li *LineItem
+ var el_count int
+ var records []string
+ var qty string
+ for records, err = reader.Read(); err == nil; records, err = reader.Read() {
+ qty = ""
+ li = &LineItem{Elements: []string{}}
+ for i, col := range header {
+ switch strings.ToLower(col) {
+ case "qty", "quantity":
+ // if a quantity is specified, use it; else interpret it
+ // from element id count
+ appendField(&qty, &records[i])
+ case "mpn", "manufacturer part number":
+ appendField(&li.Mpn, &records[i])
+ case "mfg", "manufacturer":
+ appendField(&li.Manufacturer, &records[i])
+ case "element", "id", "circuit element", "symbol_id", "symbol id":
+ for _, symb := range strings.Split(records[i], ",") {
+ symb = strings.TrimSpace(symb)
+ if !isShortName(symb) {
+ li.Elements = append(li.Elements, symb)
+ } else if *verbose {
+ log.Println("symbol not a ShortName, skipped: " + symb)
+ }
+ }
+ case "function", "purpose", "role", "subsystem":
+ appendField(&li.Function, &records[i])
+ case "formfactor", "form_factor", "form factor", "case/package", "package", "symbol", "footprint":
+ appendField(&li.FormFactor, &records[i])
+ case "specs", "specifications", "properties", "attributes", "value", "type":
+ appendField(&li.Specs, &records[i])
+ case "comment", "comments", "note", "notes":
+ appendField(&li.Comment, &records[i])
+ case "category":
+ appendField(&li.Category, &records[i])
+ case "tag":
+ appendField(&li.Tag, &records[i])
+ default:
+ // pass, no assignment
+ // TODO: should warn on this first time around?
+ }
+ }
+ if qty != "" {
+ if n, err := strconv.Atoi(qty); err == nil && n >= 0 {
+ el_count = len(li.Elements)
+ // XXX: kludge
+ if n > 99999 || el_count > 99999 {
+ log.Fatal("too large a quantity of elements passed, crashing")
+ } else if el_count > n {
+ if *verbose {
+ log.Println("more symbols than qty, taking all symbols")
+ }
+ } else if el_count < n {
+ for j := 0; j < (n - el_count); j++ {
+ li.Elements = append(li.Elements, "")
+ }
+ }
+ }
+ }
+ if len(li.Elements) == 0 {
+ li.Elements = []string{""}
+ }
+ b.LineItems = append(b.LineItems, *li)
+ }
+ if err.Error() != "EOF" {
+ log.Fatal(err)
+ }
return &b, nil
}
diff --git a/store.go b/store.go
index e14fca6..eec014f 100644
--- a/store.go
+++ b/store.go
@@ -130,8 +130,8 @@ func (jfbs *JSONFileBomStore) listBomsForUser(user ShortName) ([]BomMeta, error)
func (jfbs *JSONFileBomStore) Persist(bm *BomMeta, b *Bom, version ShortName) error {
- b.Version = string(version)
- bm.HeadVersion = string(version)
+ b.Version = string(version)
+ bm.HeadVersion = string(version)
if err := bm.Validate(); err != nil {
return err
}