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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-12-09 13:13:00 +01:00
parent e4fca5e6b3 a00144edb9
commit d93657223f
1 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/Basics/JsonHelper.h
View File

@ -35,6 +35,9 @@
#include "Basics/json.h"
#include "Basics/StringBuffer.h"
#include "velocypack/Parser.h"
#include "velocypack/Builder.h"
namespace triagens {
namespace basics {
@ -280,6 +283,45 @@ namespace triagens {
static TRI_json_t const* checkAndGetArrayValue (TRI_json_t const*,
char const*);
////////////////////////////////////////////////////////////////////////////////
/// @brief TRI_json_t to VelocyPack, this is a temporary, inefficient method
/// which must be removed later on.
////////////////////////////////////////////////////////////////////////////////
static std::shared_ptr<arangodb::velocypack::Builder> toVelocyPack (
TRI_json_t const* json) {
std::string tmp = toString(json);
arangodb::velocypack::Parser parser;
try {
parser.parse(tmp);
}
catch (...) {
return std::shared_ptr<arangodb::velocypack::Builder>();
}
return parser.steal();
}
////////////////////////////////////////////////////////////////////////////////
/// @brief TRI_json_t to VelocyPack, writing into an existing Builder
////////////////////////////////////////////////////////////////////////////////
static int toVelocyPack (
TRI_json_t const* json,
arangodb::velocypack::Builder& builder) {
std::string tmp = toString(json);
arangodb::velocypack::Options opt;
opt.clearBuilderBeforeParse = false;
arangodb::velocypack::Parser parser(builder, &opt);
try {
parser.parse(tmp);
}
catch (...) {
return TRI_ERROR_INTERNAL;
}
return TRI_ERROR_NO_ERROR;
}
};
////////////////////////////////////////////////////////////////////////////////
@ -1149,7 +1191,6 @@ namespace triagens {
}
}
// -----------------------------------------------------------------------------
// --SECTION-- private variables
// -----------------------------------------------------------------------------