Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

CHANGELOG

@@ -1,7 +1,7 @@
 v1.4
 ------
 
-* fixed usage of --temp-path in aranogd and arangosh
+* issue #550: Make AQL graph functions support key in addition to id
 
 * issue #526: Unable to escape when an errorneous command is entered into the js shell
 
@@ -12,9 +12,19 @@ v1.4
 * issue #512: Binded Parameters for LIMIT
 
 
-v1.3.1 (2013-XX-XX)
+v1.3.2 (2013-XX-XX)
 -------------------
 
+* issue #549: wrong return code with --daemon
+
+
+v1.3.1 (2013-05-24)
+-------------------
+
+* removed currently unused _ids collection
+
+* fixed usage of --temp-path in aranogd and arangosh
+
 * issue #540: suppress return of temporary internal variables in AQL
 
 * issue #530: ReferenceError: ArangoError is not a constructor

arangod/RestHandler/RestImportHandler.cpp

@@ -173,7 +173,7 @@ void RestImportHandler::logDocument (const TRI_json_t* const json) const {
   TRI_InitStringBuffer(&buffer, TRI_UNKNOWN_MEM_ZONE);
   int res = TRI_StringifyJson(&buffer, json);
   if (res == TRI_ERROR_NO_ERROR) {
-    LOGGER_WARNING("offending document" << buffer._buffer);
+    LOGGER_WARNING("offending document: " << buffer._buffer);
   }
   TRI_DestroyStringBuffer(&buffer);
 }

html/admin/js/templates/documentView.ejs

@@ -1,4 +1,4 @@
-<div class="thumbnails2">
+<div class="thumbnails2" id="documentviewMain">
   <div id="transparentHeader">
 
   </div>

html/admin/js/views/documentView.js

@@ -21,8 +21,8 @@ var documentView = Backbone.View.extend({
     "click #documentTableID tr"         : "clicked",
     "click #editSecondRow"              : "editSecond",
     "keydown .sorting_1"                : "listenKey",
-    "keydown"                           : "listenGlobalKey",
-    "blur textarea"                     : "checkFocus"
+    "keydown #documentviewMain"         : "listenGlobalKey",
+    "blur #documentviewMain textarea"   : "checkFocus"
   },
 
   checkFocus: function(e) {

js/server/modules/org/arangodb/ahuacatl.js

@@ -3033,7 +3033,7 @@ function GRAPH_SUBNODES (searchAttributes, vertexId, visited, edges, vertices, l
 
 function GRAPH_PATHS (vertices, edgeCollection, direction, followCycles, minLength, maxLength) {
   var searchDirection;
-
+  
   direction      = direction || "outbound";
   followCycles   = followCycles || false;
   minLength      = minLength || 0;
@@ -3140,6 +3140,10 @@ function TRAVERSAL_FILTER (config, vertex, edge, path) {
 ////////////////////////////////////////////////////////////////////////////////
 
 function TRAVERSAL_FUNC (func, vertexCollection, edgeCollection, startVertex, direction, params) {
+  if (startVertex.indexOf('/') === -1) {
+    startVertex = vertexCollection + '/' + startVertex;
+  }
+
   vertexCollection = COLLECTION(vertexCollection);
   edgeCollection   = COLLECTION(edgeCollection);
 

lib/Rest/AnyServer.cpp

@@ -486,6 +486,9 @@ int AnyServer::startupDaemon () {
   if (result != 0) {
     TRI_SetProcessTitle("arangodb [daemon]");
     WritePidFile(_pidFile, result);
+
+    // issue #549: this is used as the exit code
+    result = 0;
   }
 
   // child process