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 2012-05-24 14:34:51 +02:00
parent cf8c339e7c 8d2b9b0ac7
commit 154d18f8a9
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.unittests
View File

@ -59,7 +59,7 @@ start-server:
@rm -f "$(PIDFILE)" @rm -f "$(PIDFILE)"
@rm -rf "$(VOCDIR)" @rm -rf "$(VOCDIR)"
@mkdir "$(VOCDIR)" @mkdir -p "$(VOCDIR)"
($(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) --pid-file $(PIDFILE) --watch-process $(PID) --server.http-port $(VOCHOST):$(VOCPORT) && rm -rf "$(VOCDIR)") & ($(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) --pid-file $(PIDFILE) --watch-process $(PID) --server.http-port $(VOCHOST):$(VOCPORT) && rm -rf "$(VOCDIR)") &

1
VocBase/index.c
View File

@ -1057,6 +1057,7 @@ TRI_index_t* TRI_CreateGeo1Index (struct TRI_doc_collection_s* collection,
} }
ln = TRI_DuplicateString(locationName); ln = TRI_DuplicateString(locationName);
// TODO: ln might be NULL
TRI_InitVectorString(&geo->base._fields, TRI_UNKNOWN_MEM_ZONE); TRI_InitVectorString(&geo->base._fields, TRI_UNKNOWN_MEM_ZONE);

9
html/admin/index.html
View File

@ -391,15 +391,6 @@
<div id="avocshView" style="display: none"> <div id="avocshView" style="display: none">
<div id="avocshWindow"> <div id="avocshWindow">
<pre id="welcomemsg" style="font-family: 'courier';">
_
__ _ _ __ __ _ _ __ __ _ ___ ___| |__
/ _` | '__/ _` | '_ \ / _` |/ _ \/ __| '_ \
| (_| | | | (_| | | | | (_| | (_) \__ \ | | |
\__,_|_| \__,_|_| |_|\__, |\___/|___/_| |_|
|___/
Welcome to arangosh 0.5.1. Copyright (c) 2012 triAGENS GmbH.</pre><br><br>
</div> </div>
<form> <form>
<input type="text" class="editBox" id="avocshContent"></input><button class="minimal" id="submitAvoc">Ok</button> <input type="text" class="editBox" id="avocshContent"></input><button class="minimal" id="submitAvoc">Ok</button>

14
html/admin/js/master.js
View File

@ -2,6 +2,15 @@
/// master.js /// master.js
/// arangodb js api /// arangodb js api
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
var welcomeMSG = ""
+ " _ \n"
+ " __ _ _ __ __ _ _ __ __ _ ___ ___| |__ \n"
+ " / _` | '__/ _` | '_ \\ / _` |/ _ \\/ __| '_ \\ \n"
+ " | (_| | | | (_| | | | | (_| | (_) \\__ \\ | | | \n"
+ " \\__,_|_| \\__,_|_| |_|\\__, |\\___/|___/_| |_| \n"
+ " |___/ \n"
+ " \n"
+ "Welcome to arangosh 0.5.1. Copyright (c) 2012 triAGENS GmbH."
// documents global vars // documents global vars
var collectionCount; var collectionCount;
@ -11,6 +20,7 @@ var globalCollectionName;
var globalCollectionID; var globalCollectionID;
var globalCollectionRev; var globalCollectionRev;
var checkCollectionName; var checkCollectionName;
var printedHelp = false;
var open = false; var open = false;
var rowCounter = 0; var rowCounter = 0;
@ -706,6 +716,10 @@ var logTable = $('#logTableID').dataTable({
$('#avocshView').show(); $('#avocshView').show();
createnav ("ArangoDB Shell"); createnav ("ArangoDB Shell");
$('#avocshContent').focus(); $('#avocshContent').focus();
if (printedHelp === false) {
print(welcomeMSG + HELP);
printedHelp = true;
}
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////