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

fixed Make

This commit is contained in:
Jan Steemann 2015-07-13 09:41:32 +02:00
parent 81a18ceab7
commit 35b033dfcb
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Installation/file-list-js.sh
View File

@ -28,3 +28,4 @@ SRCDIR=$1
| egrep -v "^js/apps/system/.*/test/" \ | egrep -v "^js/apps/system/.*/test/" \
| egrep -v "^js/apps/system/.*/test_data/" \ | egrep -v "^js/apps/system/.*/test_data/" \
| egrep -v "^js/apps/system/.*/coverage/" \ | egrep -v "^js/apps/system/.*/coverage/" \
| egrep -v "fileset.*tests.*fixtures.*an.*odd.*filename"

17
js/apps/system/_admin/aardvark/APP/frontend/js/modules/org/arangodb/general-graph.js
View File

@ -408,6 +408,7 @@ AQLGenerator.prototype._edges = function(edgeExample, options) {
ex = [ex]; ex = [ex];
} }
this.options.edgeExamples = ex; this.options.edgeExamples = ex;
this.options.includeData = true;
this.bindVars["options_" + this.stack.length] = this.options; this.bindVars["options_" + this.stack.length] = this.options;
var stmt = new AQLStatement(query, "edge"); var stmt = new AQLStatement(query, "edge");
this.stack.push(stmt); this.stack.push(stmt);
@ -968,20 +969,21 @@ AQLGenerator.prototype.neighbors = function(vertexExample, options) {
opts = {}; opts = {};
} }
opts.neighborExamples = ex; opts.neighborExamples = ex;
opts.includeData = true;
this.bindVars["options_" + this.stack.length] = opts; this.bindVars["options_" + this.stack.length] = opts;
var stmt = new AQLStatement(query, "neighbor"); var stmt = new AQLStatement(query, "neighbor");
this.stack.push(stmt); this.stack.push(stmt);
/*
this.lastVar = resultName; this.lastVar = resultName;
this._path.push(resultName); this._path.push(resultName);
this._pathVertices.push(resultName); this._pathVertices.push(resultName);
*/
/*
this.lastVar = resultName + ".vertex"; this.lastVar = resultName + ".vertex";
this._path.push(resultName + ".path"); this._path.push(resultName + ".path");
this._pathVertices.push("SLICE(" + resultName + ".path.vertices, 1)"); this._pathVertices.push("SLICE(" + resultName + ".path.vertices, 1)");
this._pathEdges.push(resultName + ".path.edges"); this._pathEdges.push(resultName + ".path.edges");
*/
return this; return this;
}; };
@ -3037,7 +3039,7 @@ Graph.prototype._commonNeighbors = function(vertex1Example, vertex2Example, opti
+ ',@ex2' + ',@ex2'
+ ',@options1' + ',@options1'
+ ',@options2' + ',@options2'
+ ') SORT ATTRIBUTES(e)[0] RETURN e'; + ') RETURN e';
optionsVertex1 = optionsVertex1 || {}; optionsVertex1 = optionsVertex1 || {};
optionsVertex2 = optionsVertex2 || {}; optionsVertex2 = optionsVertex2 || {};
var bindVars = { var bindVars = {
@ -3094,8 +3096,7 @@ Graph.prototype._countCommonNeighbors = function(vertex1Example, vertex2Example,
+ ',@ex2' + ',@ex2'
+ ',@options1' + ',@options1'
+ ',@options2' + ',@options2'
+ ') FOR a in ATTRIBUTES(e) FOR b in ATTRIBUTES(e[a]) ' + ') RETURN [e.left, e.right, LENGTH(e.neighbors)]';
+ 'SORT ATTRIBUTES(e)[0] RETURN [a, b, LENGTH(e[a][b]) ]';
optionsVertex1 = optionsVertex1 || {}; optionsVertex1 = optionsVertex1 || {};
optionsVertex2 = optionsVertex2 || {}; optionsVertex2 = optionsVertex2 || {};
var bindVars = { var bindVars = {
@ -4655,11 +4656,10 @@ Graph.prototype._removeVertexCollection = function(vertexCollectionName, dropCol
Graph.prototype._getConnectingEdges = function(vertexExample1, vertexExample2, options) { Graph.prototype._getConnectingEdges = function(vertexExample1, vertexExample2, options) {
if (!options) { options = options || {};
options = {};
}
var opts = { var opts = {
includeData: true
}; };
if (options.vertex1CollectionRestriction) { if (options.vertex1CollectionRestriction) {
@ -4687,7 +4687,6 @@ Graph.prototype._getConnectingEdges = function(vertexExample1, vertexExample2, o
+ ',@vertexExample' + ',@vertexExample'
+ ',@options' + ',@options'
+ ')'; + ')';
options = options || {};
var bindVars = { var bindVars = {
"graphName": this.__name, "graphName": this.__name,
"vertexExample": vertexExample1, "vertexExample": vertexExample1,