barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename triple entities were relevant

Browse source
This commit is contained in:
kortschak 2014-08-27 21:27:01 +09:30
parent ddf8849e60
commit 443a091b72
62 changed files with 664 additions and 664 deletions
Download patch file Download diff file Expand all files Collapse all files

38
http/write.go
View file

@ -29,18 +29,18 @@ import (
"github.com/google/cayley/quad/cquads"
)
func ParseJsonToTripleList(jsonBody []byte) ([]quad.Quad, error) {
var tripleList []quad.Quad
err := json.Unmarshal(jsonBody, &tripleList)
func ParseJsonToQuadList(jsonBody []byte) ([]quad.Quad, error) {
var quads []quad.Quad
err := json.Unmarshal(jsonBody, &quads)
if err != nil {
return nil, err
}
for i, t := range tripleList {
if !t.IsValid() {
return nil, fmt.Errorf("Invalid triple at index %d. %s", i, t)
for i, q := range quads {
if !q.IsValid() {
return nil, fmt.Errorf("Invalid quad at index %d. %s", i, q)
}
}
return tripleList, nil
return quads, nil
}
func (api *Api) ServeV1Write(w http.ResponseWriter, r *http.Request, _ httprouter.Params) int {
@ -51,12 +51,12 @@ func (api *Api) ServeV1Write(w http.ResponseWriter, r *http.Request, _ httproute
if err != nil {
return FormatJson400(w, err)
}
tripleList, terr := ParseJsonToTripleList(bodyBytes)
if terr != nil {
return FormatJson400(w, terr)
quads, err := ParseJsonToQuadList(bodyBytes)
if err != nil {
return FormatJson400(w, err)
}
api.handle.QuadWriter.AddQuadSet(tripleList)
fmt.Fprintf(w, "{\"result\": \"Successfully wrote %d triples.\"}", len(tripleList))
api.handle.QuadWriter.AddQuadSet(quads)
fmt.Fprintf(w, "{\"result\": \"Successfully wrote %d quads.\"}", len(quads))
return 200
}
@ -103,7 +103,7 @@ func (api *Api) ServeV1WriteNQuad(w http.ResponseWriter, r *http.Request, params
}
api.handle.QuadWriter.AddQuadSet(block)
fmt.Fprintf(w, "{\"result\": \"Successfully wrote %d triples.\"}", n)
fmt.Fprintf(w, "{\"result\": \"Successfully wrote %d quads.\"}", n)
return 200
}
@ -116,15 +116,15 @@ func (api *Api) ServeV1Delete(w http.ResponseWriter, r *http.Request, params htt
if err != nil {
return FormatJson400(w, err)
}
tripleList, terr := ParseJsonToTripleList(bodyBytes)
if terr != nil {
return FormatJson400(w, terr)
quads, err := ParseJsonToQuadList(bodyBytes)
if err != nil {
return FormatJson400(w, err)
}
count := 0
for _, triple := range tripleList {
api.handle.QuadWriter.RemoveQuad(triple)
for _, q := range quads {
api.handle.QuadWriter.RemoveQuad(q)
count++
}
fmt.Fprintf(w, "{\"result\": \"Successfully deleted %d triples.\"}", count)
fmt.Fprintf(w, "{\"result\": \"Successfully deleted %d quads.\"}", count)
return 200
}