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

Explicitly give the Collection Type for HTTP generate saved result

This commit is contained in:
Michael Hackstein 2016-02-17 09:39:11 +01:00
parent 0511a944ad
commit 11046e30a9
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/RestHandler/RestDocumentHandler.cpp
View File

@ -157,7 +157,7 @@ bool RestDocumentHandler::createDocument() {
return false;
}
generateSaved(result, collectionName);
generateSaved(result, collectionName, TRI_COL_TYPE_DOCUMENT);
return true;
}

10
arangod/RestHandler/RestVocbaseBaseHandler.cpp
View File

@ -127,9 +127,14 @@ RestVocbaseBaseHandler::RestVocbaseBaseHandler(HttpRequest* request)
RestVocbaseBaseHandler::~RestVocbaseBaseHandler() {}
////////////////////////////////////////////////////////////////////////////////
/// @brief Generate a result for successful save
////////////////////////////////////////////////////////////////////////////////
void RestVocbaseBaseHandler::generateSaved(
arangodb::OperationResult const& result,
std::string const& collectionName) {
std::string const& collectionName,
TRI_col_type_e type) {
VPackSlice slice = result.slice();
TRI_ASSERT(slice.isObject());
@ -141,9 +146,6 @@ void RestVocbaseBaseHandler::generateSaved(
_response->setContentType("application/json; charset=utf-8");
_response->setHeader("etag", 4, "\"" + slice.get(TRI_VOC_ATTRIBUTE_REV).copyString() + "\"");
// TODO This has to be replaced properly
TRI_col_type_e type = TRI_COL_TYPE_DOCUMENT;
std::string escapedHandle(DocumentHelper::assembleDocumentId(
collectionName, slice.get(TRI_VOC_ATTRIBUTE_KEY).copyString(), true));
if (_request->compatibility() < 10400L) {

2
arangod/RestHandler/RestVocbaseBaseHandler.h
View File

@ -189,7 +189,7 @@ class RestVocbaseBaseHandler : public RestBaseHandler {
//////////////////////////////////////////////////////////////////////////////
void generateSaved(arangodb::OperationResult const& result,
std::string const& collectionName);
std::string const& collectionName, TRI_col_type_e type);
//////////////////////////////////////////////////////////////////////////////
/// @brief generates deleted message