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

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Esteban Lombeyda 2014-05-26 12:40:21 +02:00
parent 14a7074002 d01fa951c2
commit 7840b42358
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/common/modules/org/arangodb/general-graph.js
View File

@ -870,13 +870,19 @@ Graph.prototype._vertexCollections = function() {
// might be needed from AQL itself // might be needed from AQL itself
Graph.prototype._EDGES = function(vertexId) { Graph.prototype._EDGES = function(vertexId) {
if (vertexId.indexOf("/") === -1) {
throw vertexId + " is not a valid id";
}
var collection = vertexId.split("/");
if (!db._exists(collection)) {
throw collection + " does not exists.";
}
var edgeCollections = this._edgeCollections(); var edgeCollections = this._edgeCollections();
var result = []; var result = [];
edgeCollections.forEach( edgeCollections.forEach(
function(edgeCollection) { function(edgeCollection) {
//todo: test, if collection may point to vertex
result = result.concat(edgeCollection.edges(vertexId)); result = result.concat(edgeCollection.edges(vertexId));
} }
); );
@ -888,13 +894,20 @@ Graph.prototype._EDGES = function(vertexId) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Graph.prototype._INEDGES = function(vertexId) { Graph.prototype._INEDGES = function(vertexId) {
if (vertexId.indexOf("/") === -1) {
throw vertexId + " is not a valid id";
}
var collection = vertexId.split("/");
if (!db._exists(collection)) {
throw collection + " does not exists.";
}
var edgeCollections = this._edgeCollections(); var edgeCollections = this._edgeCollections();
var result = []; var result = [];
edgeCollections.forEach( edgeCollections.forEach(
function(edgeCollection) { function(edgeCollection) {
//todo: test, if collection may point to vertex
result = result.concat(edgeCollection.inEdges(vertexId)); result = result.concat(edgeCollection.inEdges(vertexId));
} }
); );
@ -906,13 +919,20 @@ Graph.prototype._INEDGES = function(vertexId) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Graph.prototype._OUTEDGES = function(vertexId) { Graph.prototype._OUTEDGES = function(vertexId) {
if (vertexId.indexOf("/") === -1) {
throw vertexId + " is not a valid id";
}
var collection = vertexId.split("/");
if (!db._exists(collection)) {
throw collection + " does not exists.";
}
var edgeCollections = this._edgeCollections(); var edgeCollections = this._edgeCollections();
var result = []; var result = [];
edgeCollections.forEach( edgeCollections.forEach(
function(edgeCollection) { function(edgeCollection) {
//todo: test, if collection may point to vertex
result = result.concat(edgeCollection.outEdges(vertexId)); result = result.concat(edgeCollection.outEdges(vertexId));
} }
); );