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:
Jan Steemann 2013-01-30 10:03:06 +01:00
parent 8136f40f79 f795cec345
commit e6eca506d4
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/client/client.js
View File

@ -1,5 +1,5 @@
/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */ /*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */
/*global require */ /*global require, SYS_UNIT_TESTS */
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief ArangoShell client API /// @brief ArangoShell client API

23
js/common/modules/org/arangodb/graph/traversal.js
View File

@ -1,4 +1,4 @@
/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */ /*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true, continue: true */
/*global require, exports */ /*global require, exports */
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -33,6 +33,8 @@ var arangodb = require("org/arangodb");
var db = arangodb.db; var db = arangodb.db;
var ArangoTraverser;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- public functions // --SECTION-- public functions
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -379,10 +381,12 @@ function trackingVisitor (config, result, vertex, path) {
else if (obj instanceof Object) { else if (obj instanceof Object) {
copy = { }; copy = { };
for (i in obj) { if (obj.hasOwnProperty) {
if (obj.hasOwnProperty && obj.hasOwnProperty(i)) { for (i in obj) {
copy[i] = clone(obj[i]); if (obj.hasOwnProperty(i)) {
} copy[i] = clone(obj[i]);
}
}
} }
} }
@ -564,9 +568,10 @@ function parseFilterResult (args) {
function checkUniqueness (config, visited, vertex, edge) { function checkUniqueness (config, visited, vertex, edge) {
var uniqueness = config.uniqueness; var uniqueness = config.uniqueness;
var datasource = config.datasource; var datasource = config.datasource;
var id;
if (uniqueness.vertices !== ArangoTraverser.UNIQUE_NONE) { if (uniqueness.vertices !== ArangoTraverser.UNIQUE_NONE) {
var id = datasource.getVertexId(vertex); id = datasource.getVertexId(vertex);
if (visited.vertices[id] === true) { if (visited.vertices[id] === true) {
return false; return false;
@ -576,7 +581,7 @@ function checkUniqueness (config, visited, vertex, edge) {
} }
if (edge !== null && uniqueness.edges !== ArangoTraverser.UNIQUE_NONE) { if (edge !== null && uniqueness.edges !== ArangoTraverser.UNIQUE_NONE) {
var id = datasource.getEdgeId(edge); id = datasource.getEdgeId(edge);
if (visited.edges[id] === true) { if (visited.edges[id] === true) {
return false; return false;
@ -851,7 +856,7 @@ function depthFirstSearch () {
/// @brief traversal constructor /// @brief traversal constructor
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function ArangoTraverser (config) { ArangoTraverser = function (config) {
var defaults = { var defaults = {
order: ArangoTraverser.PRE_ORDER, order: ArangoTraverser.PRE_ORDER,
itemOrder: ArangoTraverser.FORWARD, itemOrder: ArangoTraverser.FORWARD,
@ -912,7 +917,7 @@ function ArangoTraverser (config) {
} }
this.config = config; this.config = config;
} };
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}