Skip to content

Commit

Permalink
include errMsg in calls to napping
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmcvetta
jmcvetta committed Sep 27, 2013
1 parent 085b38b commit 0de29ad
Show file tree
Hide file tree
Showing 9 changed files with 74 additions and 107 deletions.
9 changes: 4 additions & 5 deletions cypher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,20 @@ func (db *Database) Cypher(q *CypherQuery) error {
Query: q.Statement,
Parameters: q.Parameters,
}
ne := new(NeoError)
ne := NeoError{}
url := db.HrefCypher
// Method: "POST"
// Data: &cReq
// Result: &cRes
// Error: ne
// }
resp, err := db.Session.Post(url, &payload, &result)
resp, err := db.Session.Post(url, &payload, &result, &ne)
if err != nil {
return err
}
if resp.Status() != 200 {
resp.Unmarshal(ne)
logPretty(ne)
return *ne
return ne
}
q.cr = result
if q.Result != nil {
Expand Down Expand Up @@ -124,7 +123,7 @@ func (db *Database) CypherBatch(qs []*CypherQuery) error {
res := []batchCypherResponse{}
ne := NeoError{}
url := db.HrefBatch
resp, err := db.Session.Post(url, payload, &res)
resp, err := db.Session.Post(url, payload, &res, &ne)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func Connect(uri string) (*Database, error) {
// Method: "GET",
// Result: &db,
// Error: &e,
resp, err := db.Session.Get(db.Url, nil, &db)
resp, err := db.Session.Get(db.Url, nil, &db, nil)
if err != nil {
return nil, err
}
Expand Down
32 changes: 13 additions & 19 deletions entity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@ type entity struct {
func (e *entity) SetProperty(key string, value string) error {
parts := []string{e.HrefProperties, key}
url := strings.Join(parts, "/")
resp, err := e.Db.Session.Put(url, &value, nil)
ne := NeoError{}
resp, err := e.Db.Session.Put(url, &value, nil, &ne)
if err != nil {
return err
}
if resp.Status() != 204 {
ne := NeoError{}
resp.Unmarshal(&ne)
return ne
}
return nil // Success!
Expand All @@ -39,7 +38,8 @@ func (e *entity) Property(key string) (string, error) {
var val string
parts := []string{e.HrefProperties, key}
url := strings.Join(parts, "/")
resp, err := e.Db.Session.Get(url, nil, &val)
ne := NeoError{}
resp, err := e.Db.Session.Get(url, nil, &val, &ne)
if err != nil {
logPretty(err)
return val, err
Expand All @@ -49,8 +49,6 @@ func (e *entity) Property(key string) (string, error) {
case 404:
return val, NotFound
default:
ne := NeoError{}
resp.Unmarshal(&ne)
return val, ne
}
return val, nil // Success!
Expand All @@ -60,7 +58,8 @@ func (e *entity) Property(key string) (string, error) {
func (e *entity) DeleteProperty(key string) error {
parts := []string{e.HrefProperties, key}
url := strings.Join(parts, "/")
resp, err := e.Db.Session.Delete(url)
ne := NeoError{}
resp, err := e.Db.Session.Delete(url, nil, &ne)
if err != nil {
return err
}
Expand All @@ -70,15 +69,14 @@ func (e *entity) DeleteProperty(key string) error {
case 404:
return NotFound
}
ne := NeoError{}
resp.Unmarshal(&ne)
logPretty(ne)
return ne
}

// Delete removes the object from the DB.
func (e *entity) Delete() error {
resp, err := e.Db.Session.Delete(e.HrefSelf)
ne := NeoError{}
resp, err := e.Db.Session.Delete(e.HrefSelf, nil, &ne)
if err != nil {
return err
}
Expand All @@ -89,8 +87,6 @@ func (e *entity) Delete() error {
case 409:
return CannotDelete
default:
ne := NeoError{}
resp.Unmarshal(&ne)
logPretty(resp.Status())
logPretty(ne)
return ne
Expand All @@ -101,7 +97,7 @@ func (e *entity) Delete() error {
// Properties fetches all properties
func (e *entity) Properties() (Props, error) {
props := Props{}
resp, err := e.Db.Session.Get(e.HrefProperties, nil, &props)
resp, err := e.Db.Session.Get(e.HrefProperties, nil, &props, nil)
if err != nil {
return props, err
}
Expand All @@ -114,22 +110,22 @@ func (e *entity) Properties() (Props, error) {

// SetProperties updates all properties, overwriting any existing properties.
func (e *entity) SetProperties(p Props) error {
resp, err := e.Db.Session.Put(e.HrefProperties, &p, nil)
ne := NeoError{}
resp, err := e.Db.Session.Put(e.HrefProperties, &p, nil, &ne)
if err != nil {
return err
}
if resp.Status() == 204 {
return nil // Success!
}
ne := NeoError{}
resp.Unmarshal(&ne)
logPretty(ne)
return ne
}

// DeleteProperties deletes all properties.
func (e *entity) DeleteProperties() error {
resp, err := e.Db.Session.Delete(e.HrefProperties)
ne := NeoError{}
resp, err := e.Db.Session.Delete(e.HrefProperties, nil, &ne)
if err != nil {
return err
}
Expand All @@ -139,8 +135,6 @@ func (e *entity) DeleteProperties() error {
case 404:
return NotFound
}
ne := NeoError{}
resp.Unmarshal(&ne)
logPretty(ne)
return ne
}
33 changes: 14 additions & 19 deletions legacy_index.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,32 +30,31 @@ func (db *Database) createIndex(href, name, idxType, provider string) (*index, e
}
payload.Config = config
}
res := new(indexResponse)
resp, err := db.Session.Post(href, &payload, &res)
res := indexResponse{}
ne := NeoError{}
resp, err := db.Session.Post(href, &payload, &res, &ne)
if err != nil {
logPretty(err)
return nil, err
}
if resp.Status() != 201 {
ne := NeoError{}
resp.Unmarshal(&ne)
return nil, ne
}
idx.populate(res)
idx.populate(&res)
idx.HrefIndex = href
return idx, nil
}

func (db *Database) indexes(href string) ([]*index, error) {
res := map[string]indexResponse{}
nis := []*index{}
resp, err := db.Session.Get(href, nil, &res)
ne := NeoError{}
resp, err := db.Session.Get(href, nil, &res, &ne)
if err != nil {
return nis, err
}
if resp.Status() != 200 {
ne := NeoError{}
resp.Unmarshal(&ne)
logPretty(ne)
return nis, ne
}
Expand All @@ -80,7 +79,8 @@ func (db *Database) index(href, name string) (*index, error) {
if err != nil {
return idx, err
}
resp, err := db.Session.Get(u.String(), nil, nil)
ne := NeoError{}
resp, err := db.Session.Get(u.String(), nil, nil, &ne)
if err != nil {
return nil, err
}
Expand All @@ -90,8 +90,6 @@ func (db *Database) index(href, name string) (*index, error) {
case 404:
return nil, NotFound
default:
ne := NeoError{}
resp.Unmarshal(&ne)
logPretty(ne)
return idx, ne
}
Expand Down Expand Up @@ -137,13 +135,12 @@ func (idx *index) Delete() error {
if err != nil {
return err
}
resp, err := idx.db.Session.Delete(uri)
ne := NeoError{}
resp, err := idx.db.Session.Delete(uri, nil, &ne)
if err != nil {
return err
}
if resp.Status() != 204 {
ne := NeoError{}
resp.Unmarshal(&ne)
logPretty(ne)
return ne
}
Expand All @@ -166,13 +163,12 @@ func (idx *index) add(e entity, key string, value interface{}) error {
Key: key,
Value: value,
}
resp, err := idx.db.Session.Post(uri, &payload, nil)
ne := NeoError{}
resp, err := idx.db.Session.Post(uri, &payload, nil, &ne)
if err != nil {
return err
}
if resp.Status() != 201 {
ne := NeoError{}
resp.Unmarshal(&ne)
logPretty(ne)
return ne
}
Expand All @@ -192,13 +188,12 @@ func (idx *index) remove(e entity, id, key, value string) error {
uri = join(uri, key, value)
}
uri = join(uri, id)
resp, err := idx.db.Session.Delete(uri)
ne := NeoError{}
resp, err := idx.db.Session.Delete(uri, nil, &ne)
if err != nil {
return err
}
if resp.Status() != 204 {
ne := NeoError{}
resp.Unmarshal(&ne)
logPretty(ne)
return ne
}
Expand Down
Loading

0 comments on commit 0de29ad

Please sign in to comment.