diff --git a/.gitignore b/.gitignore index a02d1189f4..55d6d6c1a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -js-*.h .deps .dirstamp *.o @@ -18,11 +17,6 @@ js-*.h *.patch *.lnk -.idea -.setup-mr-directories -.setup-js-directories -.file-list-js - testresult.json build*/ @@ -60,12 +54,10 @@ Documentation/Books/Users/manual.mobi Documentation/Books/Users/manual.pdf Documentation/Books/Makefile Documentation/Books/Users/node_modules/ -Documentation/Examples/*.generated Documentation/Books/ppbooks/ +Documentation/Books/allComments.txt UnitTests/HttpInterface/logs/ -UnitTests/basics_suite -UnitTests/geo_suite arangod/Aql/grammar.c arangod/Aql/grammar.cpp @@ -88,12 +80,11 @@ lib/JsonParser/json-parser.c lib/JsonParser/json-parser.cpp lib/V8/v8-json.cpp -cppcheck.log -cppcheck.tmp - Installation/epm/arangodb.sublist Installation/MacOSX/Bundle/Info.plist + nbproject/ +.idea test.cpp.txt @@ -112,7 +103,6 @@ js/apps/* js/apps/system/_admin/aardvark/APP/node_modules/* 3rdParty/etcd/src/ -Documentation/Books/allComments.txt .gdb-history npm-debug.log diff --git a/arangod/RestHandler/RestEdgesHandler.cpp b/arangod/RestHandler/RestEdgesHandler.cpp index 0d565841aa..ab9d79f2d9 100644 --- a/arangod/RestHandler/RestEdgesHandler.cpp +++ b/arangod/RestHandler/RestEdgesHandler.cpp @@ -40,25 +40,35 @@ HttpHandler::status_t RestEdgesHandler::execute() { HttpRequest::HttpRequestType type = _request->requestType(); // execute one of the CRUD methods - switch (type) { - case HttpRequest::HTTP_REQUEST_GET: { - std::vector empty; - readEdges(empty); - break; - } - case HttpRequest::HTTP_REQUEST_PUT: - readFilteredEdges(); - break; - case HttpRequest::HTTP_REQUEST_POST: - readEdgesForMultipleVertices(); - break; - case HttpRequest::HTTP_REQUEST_HEAD: - case HttpRequest::HTTP_REQUEST_DELETE: - case HttpRequest::HTTP_REQUEST_ILLEGAL: - default: { - generateNotImplemented("ILLEGAL " + EDGES_PATH); - break; + try { + switch (type) { + case HttpRequest::HTTP_REQUEST_GET: { + std::vector empty; + readEdges(empty); + break; + } + case HttpRequest::HTTP_REQUEST_PUT: + readFilteredEdges(); + break; + case HttpRequest::HTTP_REQUEST_POST: + readEdgesForMultipleVertices(); + break; + case HttpRequest::HTTP_REQUEST_HEAD: + case HttpRequest::HTTP_REQUEST_DELETE: + case HttpRequest::HTTP_REQUEST_ILLEGAL: + default: { + generateNotImplemented("ILLEGAL " + EDGES_PATH); + break; + } } + } catch (arangodb::basics::Exception const& ex) { + generateError(HttpResponse::responseCode(ex.code()), ex.code(), ex.what()); + } + catch (std::exception const& ex) { + generateError(HttpResponse::SERVER_ERROR, TRI_ERROR_INTERNAL, ex.what()); + } + catch (...) { + generateError(HttpResponse::SERVER_ERROR, TRI_ERROR_INTERNAL); } // this handler is done @@ -80,6 +90,10 @@ bool RestEdgesHandler::getEdgesForVertex( TRI_document_collection_t* docCol = trx.trxCollection()->_collection->_collection; + if (trx.orderDitch(trx.trxCollection()) == nullptr) { + THROW_ARANGO_EXCEPTION(TRI_ERROR_OUT_OF_MEMORY); + } + std::vector&& edges = TRI_LookupEdgesDocumentCollection( &trx, docCol, direction, start.cid, const_cast(start.key)); diff --git a/js/apps/system/_admin/aardvark/APP/GruntFile.js b/js/apps/system/_admin/aardvark/APP/GruntFile.js index 3d262fffab..61944c82d8 100644 --- a/js/apps/system/_admin/aardvark/APP/GruntFile.js +++ b/js/apps/system/_admin/aardvark/APP/GruntFile.js @@ -47,6 +47,7 @@ "frontend/js/lib/jquery.textfill.min.js", "frontend/js/lib/jquery.noty.packaged.min.js", "frontend/js/lib/select2.min.js", + "frontend/js/lib/typeahead.bundle.min.js", "frontend/js/lib/numeral.min.js", "frontend/js/lib/sigma.min.js", "frontend/js/lib/jsoneditor-min.js", diff --git a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster-min.html b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster-min.html index ae34dc8c72..7f9770de9e 100644 --- a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster-min.html +++ b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster-min.html @@ -796,4 +796,4 @@ -
\ No newline at end of file +
\ No newline at end of file diff --git a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster-min.html.gz b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster-min.html.gz index bb8ccfbe95..3fbf65df1d 100644 Binary files a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster-min.html.gz and b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster-min.html.gz differ diff --git a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.html b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.html index 428288913c..417c437c39 100644 --- a/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.html +++ b/js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.html @@ -913,6 +913,9 @@ + +