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

fixed client-side implementation of function registration

This commit is contained in:
Jan Steemann 2014-01-03 13:58:01 +01:00
parent ca41447af3
commit 03b55488b6
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/apps/system/aardvark/frontend/js/modules/org/arangodb/aql/functions.js
View File

@ -293,15 +293,15 @@ var registerFunction = function (name, code, isDeterministic) {
} }
var exists = false; var exists = false;
var collection = getStorage();
var result = db._executeTransaction({ var result = db._executeTransaction({
collections: { collections: {
write: collection.name() write: getStorage().name()
}, },
action: function (params) { action: function (params) {
var collection = require("internal").db._collection(params.collection);
var name = params.name; var name = params.name;
var collection = params.collection;
try { try {
var doc = collection.document(name.toUpperCase()); var doc = collection.document(name.toUpperCase());
if (doc !== null) { if (doc !== null) {
@ -315,8 +315,8 @@ var registerFunction = function (name, code, isDeterministic) {
var data = { var data = {
_key: name.toUpperCase(), _key: name.toUpperCase(),
name: name, name: name,
code: code, code: params.code,
isDeterministic: isDeterministic || false isDeterministic: params.isDeterministic || false
}; };
collection.save(data); collection.save(data);
@ -324,7 +324,9 @@ var registerFunction = function (name, code, isDeterministic) {
}, },
params: { params: {
name: name, name: name,
collection: collection code: code,
isDeterministic: isDeterministic,
collection: getStorage().name()
} }
}); });

14
js/common/modules/org/arangodb/aql/functions.js
View File

@ -292,15 +292,15 @@ var registerFunction = function (name, code, isDeterministic) {
} }
var exists = false; var exists = false;
var collection = getStorage();
var result = db._executeTransaction({ var result = db._executeTransaction({
collections: { collections: {
write: collection.name() write: getStorage().name()
}, },
action: function (params) { action: function (params) {
var collection = require("internal").db._collection(params.collection);
var name = params.name; var name = params.name;
var collection = params.collection;
try { try {
var doc = collection.document(name.toUpperCase()); var doc = collection.document(name.toUpperCase());
if (doc !== null) { if (doc !== null) {
@ -314,8 +314,8 @@ var registerFunction = function (name, code, isDeterministic) {
var data = { var data = {
_key: name.toUpperCase(), _key: name.toUpperCase(),
name: name, name: name,
code: code, code: params.code,
isDeterministic: isDeterministic || false isDeterministic: params.isDeterministic || false
}; };
collection.save(data); collection.save(data);
@ -323,7 +323,9 @@ var registerFunction = function (name, code, isDeterministic) {
}, },
params: { params: {
name: name, name: name,
collection: collection code: code,
isDeterministic: isDeterministic,
collection: getStorage().name()
} }
}); });