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

Fix for return format of ArangoDB, now it is always interpreted as JSON-Object

This commit is contained in:
Michael Hackstein 2013-03-20 14:31:39 +01:00
parent c8b19823d3
commit ff14ec670d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
html/admin/js/graphViewer/graph/arangoAdapter.js
View File

@ -135,6 +135,7 @@ function ArangoAdapter(arangodb, nodes, edges, nodeCollection, edgeCollection, w
url: api.cursor, url: api.cursor,
data: JSON.stringify(data), data: JSON.stringify(data),
contentType: "application/json", contentType: "application/json",
dataType: "json",
processData: false, processData: false,
success: function(data) { success: function(data) {
onSuccess(data.result); onSuccess(data.result);
@ -142,9 +143,7 @@ function ArangoAdapter(arangodb, nodes, edges, nodeCollection, edgeCollection, w
error: function(data) { error: function(data) {
try { try {
console.log(data.statusText); console.log(data.statusText);
var temp = JSON.parse(data); throw "[" + data.errorNum + "] " + data.errorMessage;
console.log(temp);
throw "[" + temp.errorNum + "] " + temp.errorMessage;
} }
catch (e) { catch (e) {
console.log(e); console.log(e);
@ -299,6 +298,7 @@ function ArangoAdapter(arangodb, nodes, edges, nodeCollection, edgeCollection, w
type: "POST", type: "POST",
url: api.edge + "&from=" + edgeToAdd.source._id + "&to=" + edgeToAdd.target._id, url: api.edge + "&from=" + edgeToAdd.source._id + "&to=" + edgeToAdd.target._id,
data: JSON.stringify({}), data: JSON.stringify({}),
dataType: "json",
contentType: "application/json", contentType: "application/json",
processData: false, processData: false,
success: function(data) { success: function(data) {
@ -319,6 +319,7 @@ function ArangoAdapter(arangodb, nodes, edges, nodeCollection, edgeCollection, w
type: "DELETE", type: "DELETE",
url: api.document + edgeToRemove._id, url: api.document + edgeToRemove._id,
contentType: "application/json", contentType: "application/json",
dataType: "json",
processData: false, processData: false,
success: function() { success: function() {
callback(); callback();
@ -336,6 +337,7 @@ function ArangoAdapter(arangodb, nodes, edges, nodeCollection, edgeCollection, w
type: "PUT", type: "PUT",
url: api.document + edgeToPatch._id, url: api.document + edgeToPatch._id,
data: JSON.stringify(patchData), data: JSON.stringify(patchData),
dataType: "json",
contentType: "application/json", contentType: "application/json",
processData: false, processData: false,
success: function(data) { success: function(data) {
@ -354,6 +356,7 @@ function ArangoAdapter(arangodb, nodes, edges, nodeCollection, edgeCollection, w
type: "POST", type: "POST",
url: api.node, url: api.node,
data: JSON.stringify(nodeToAdd), data: JSON.stringify(nodeToAdd),
dataType: "json",
contentType: "application/json", contentType: "application/json",
processData: false, processData: false,
success: function(data) { success: function(data) {
@ -380,6 +383,7 @@ function ArangoAdapter(arangodb, nodes, edges, nodeCollection, edgeCollection, w
cache: false, cache: false,
type: "DELETE", type: "DELETE",
url: api.document + nodeToRemove._id, url: api.document + nodeToRemove._id,
dataType: "json",
contentType: "application/json", contentType: "application/json",
processData: false, processData: false,
success: function() { success: function() {
@ -403,6 +407,7 @@ function ArangoAdapter(arangodb, nodes, edges, nodeCollection, edgeCollection, w
type: "PUT", type: "PUT",
url: api.document + nodeToPatch._id, url: api.document + nodeToPatch._id,
data: JSON.stringify(patchData), data: JSON.stringify(patchData),
dataType: "json",
contentType: "application/json", contentType: "application/json",
processData: false, processData: false,
success: function(data) { success: function(data) {