Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed error messages

This commit is contained in:
Jan Steemann 2015-11-11 13:57:49 +01:00
parent 7780b48539
commit aa38f5d036
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arangod/Aql/Functions.cpp
View File

@ -2282,8 +2282,6 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query,
if (vertexInfo.isString()) {
vertexId = basics::JsonHelper::getStringValue(vertexInfo.json(), "");
if (vertexId.find("/") != std::string::npos) {
// TODO tmp can be replaced by Traversal::IdStringToVertexId
size_t split;
char const* str = vertexId.c_str();
@ -2294,7 +2292,7 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query,
std::string const collectionName = vertexId.substr(0, split);
if (collectionName.compare(vColName) != 0) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_GRAPH_INVALID_PARAMETER,
"you specified vertex collection `%s` for start vertext from `%s`",
"specified vertex collection `%s` does not match start vertex collection `%s`",
vColName.c_str(),
collectionName.c_str());
}
@ -2319,7 +2317,6 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query,
THROW_ARANGO_EXCEPTION_PARAMS(TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "NEIGHBORS");
}
vertexId = basics::JsonHelper::getStringValue(vertexInfo.get("_id").json(), "");
// TODO tmp can be replaced by Traversal::IdStringToVertexId
size_t split;
char const* str = vertexId.c_str();
@ -2330,7 +2327,7 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query,
std::string const collectionName = vertexId.substr(0, split);
if (collectionName.compare(vColName) != 0) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_GRAPH_INVALID_PARAMETER,
"you specified vertex collection `%s` for start vertext from `%s`",
"specified vertex collection `%s` does not match start vertex collection `%s`",
vColName.c_str(),
collectionName.c_str());
}