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

Tearing appart Graph#addEdge and fixing the build even harder

This commit is contained in:
Lucas Dohmen 2013-06-07 14:55:34 +02:00
parent f619c7f51e
commit 567a548cff
3 changed files with 57 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/client/modules/org/arangodb/graph.js
View File

@ -424,25 +424,10 @@ Graph.prototype.drop = function () {
/// @brief adds an edge to the graph
////////////////////////////////////////////////////////////////////////////////
Graph.prototype.addEdge = function (out_vertex, in_vertex, id, label, data) {
var requestResult;
var params;
var key;
if (data === null || typeof data !== "object") {
params = {};
} else {
params = data._shallowCopy || {};
}
Graph.prototype._saveEdge = function(id, out_vertex, in_vertex, params) {
params._key = id;
params._from = out_vertex._properties._key;
params._to = in_vertex._properties._key;
params.$label = label;
if (is.notExisty(params.$label) && is.existy(data) && is.existy(data.$label)) {
params.$label = data.$label;
}
requestResult = this._connection.POST("/_api/graph/"
+ encodeURIComponent(this._properties._key) + "/edge",

54
js/common/modules/org/arangodb/graph-common.js
View File

@ -29,6 +29,7 @@
////////////////////////////////////////////////////////////////////////////////
var arangodb = require("org/arangodb"),
is = require("org/arangodb/is"),
Edge,
Graph,
Vertex,
@ -568,6 +569,59 @@ Graph.prototype.getOrAddVertex = function (id) {
return v;
};
////////////////////////////////////////////////////////////////////////////////
/// @brief adds an edge to the graph
///
/// @FUN{@FA{graph}.addEdge(@FA{out}, @FA{in}, @FA{id})}
///
/// Creates a new edge from @FA{out} to @FA{in} and returns the edge object. The
/// identifier @FA{id} must be a unique identifier or null.
///
/// @FUN{@FA{graph}.addEdge(@FA{out}, @FA{in}, @FA{id}, @FA{label})}
///
/// Creates a new edge from @FA{out} to @FA{in} with @FA{label} and returns the
/// edge object.
///
/// @FUN{@FA{graph}.addEdge(@FA{out}, @FA{in}, @FA{id}, @FA{data})}
///
/// Creates a new edge and returns the edge object. The edge contains the
/// properties defined in @FA{data}.
///
/// @FUN{@FA{graph}.addEdge(@FA{out}, @FA{in}, @FA{id}, @FA{label}, @FA{data})}
///
/// Creates a new edge and returns the edge object. The edge has the
/// label @FA{label} and contains the properties defined in @FA{data}.
///
/// @EXAMPLES
///
/// @verbinclude graph-graph-add-edge
///
/// @verbinclude graph-graph-add-edge2
////////////////////////////////////////////////////////////////////////////////
Graph.prototype.addEdge = function (out_vertex, in_vertex, id, label, data, waitForSync) {
var params;
if (is.notExisty(data) && typeof label === 'object') {
data = label;
label = null;
}
if (is.notExisty(label) && is.existy(data) && is.existy(data.$label)) {
label = data.$label;
}
if (data === null || typeof data !== "object") {
params = {};
} else {
params = data._shallowCopy || {};
}
params.$label = label;
return this._saveEdge(id, out_vertex, in_vertex, params, waitForSync);
};
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////

47
js/server/modules/org/arangodb/graph.js
View File

@ -639,60 +639,17 @@ Graph.prototype.drop = function (waitForSync) {
////////////////////////////////////////////////////////////////////////////////
/// @brief adds an edge to the graph
///
/// @FUN{@FA{graph}.addEdge(@FA{out}, @FA{in}, @FA{id})}
///
/// Creates a new edge from @FA{out} to @FA{in} and returns the edge object. The
/// identifier @FA{id} must be a unique identifier or null.
///
/// @FUN{@FA{graph}.addEdge(@FA{out}, @FA{in}, @FA{id}, @FA{label})}
///
/// Creates a new edge from @FA{out} to @FA{in} with @FA{label} and returns the
/// edge object.
///
/// @FUN{@FA{graph}.addEdge(@FA{out}, @FA{in}, @FA{id}, @FA{data})}
///
/// Creates a new edge and returns the edge object. The edge contains the
/// properties defined in @FA{data}.
///
/// @FUN{@FA{graph}.addEdge(@FA{out}, @FA{in}, @FA{id}, @FA{label}, @FA{data})}
///
/// Creates a new edge and returns the edge object. The edge has the
/// label @FA{label} and contains the properties defined in @FA{data}.
///
/// @EXAMPLES
///
/// @verbinclude graph-graph-add-edge
///
/// @verbinclude graph-graph-add-edge2
////////////////////////////////////////////////////////////////////////////////
Graph.prototype.addEdge = function (out_vertex, in_vertex, id, label, data, waitForSync) {
var ref;
var shallow;
Graph.prototype._saveEdge = function(id, out_vertex, in_vertex, shallow, waitForSync) {
this.emptyCachedPredecessors();
if (data === null || typeof data !== "object") {
shallow = {};
}
else {
shallow = data._shallowCopy || {};
}
if (id !== undefined && id !== null) {
shallow._key = String(id);
}
shallow.$label = label;
if (is.notExisty(shallow.$label) && is.existy(data) && is.existy(data.$label)) {
shallow.$label = data.$label;
}
ref = this._edges.save(out_vertex._properties._id,
ref = this._edges.save(out_vertex._properties._id,
in_vertex._properties._id, shallow, waitForSync);
return this.constructEdge(ref._id);
};