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/triAGENS/ArangoDB into devel

This commit is contained in:
scottashton 2014-11-20 11:06:56 +01:00
parent e36aa92f58 d55f1cdec2
commit 6d170ab3f5
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
View File

@ -1034,7 +1034,7 @@ AQLGenerator.prototype._getLastRestrictableStatementInfo = function() {
AQLGenerator.prototype.restrict = function(restrictions) {
var rest = stringToArray(restrictions);
if (rest.length == 0) {
if (rest.length === 0) {
return this;
}
this._addToPrint("restrict", restrictions);
@ -4539,7 +4539,7 @@ Graph.prototype._removeVertexCollection = function(vertexCollectionName, dropCol
////////////////////////////////////////////////////////////////////////////////
Graph.prototype._getConnectingEdges = function(vertexExample1, vertexExample2, options) {
var AQLStmt = new AQLGenerator(this);
if (!options) {
options = {};
}
@ -4547,11 +4547,26 @@ Graph.prototype._getConnectingEdges = function(vertexExample1, vertexExample2, o
var opts = {
};
options.vertex1CollectionRestriction ? opts.startVertexCollectionRestriction = options.vertex1CollectionRestriction : null ;
options.vertex2CollectionRestriction ? opts.endVertexCollectionRestriction = options.vertex2CollectionRestriction : null ;
options.edgeCollectionRestriction ? opts.edgeCollectionRestriction = options.edgeCollectionRestriction : null ;
options.edgeExamples ? opts.edgeExamples = options.edgeExamples : null ;
vertexExample2 ? opts.neighborExamples = vertexExample2 : null ;
if (options.vertex1CollectionRestriction) {
opts.startVertexCollectionRestriction = options.vertex1CollectionRestriction;
}
if (options.vertex2CollectionRestriction) {
opts.endVertexCollectionRestriction = options.vertex2CollectionRestriction;
}
if (options.edgeCollectionRestriction) {
opts.edgeCollectionRestriction = options.edgeCollectionRestriction;
}
if (options.edgeExamples) {
opts.edgeExamples = options.edgeExamples;
}
if (vertexExample2) {
opts.neighborExamples = vertexExample2;
}
var query = "RETURN"
+ " GRAPH_EDGES(@graphName"
+ ',@vertexExample'