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

fixed help in arangosh and web admin, fixed several broken functions

This commit is contained in:
Jan Steemann 2012-05-31 17:30:42 +02:00
parent f4e9d00bc2
commit d506033c26
5 changed files with 63 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
V8Client/arangosh.cpp
View File

@ -176,10 +176,10 @@ static FILE *PAGER = stdout;
static bool PrettyPrint = false;
////////////////////////////////////////////////////////////////////////////////
/// @brief quite start
/// @brief quiet start
////////////////////////////////////////////////////////////////////////////////
static bool Quite = false;
static bool Quiet = false;
////////////////////////////////////////////////////////////////////////////////
/// @brief request timeout (in s)
@ -532,7 +532,7 @@ static void ParseProgramOptions (int argc, char* argv[]) {
description
("help,h", "help message")
("quite,s", "no banner")
("quiet,s", "no banner")
("log.level,l", &level, "log level")
("server", &ServerAddressPort, "server address and port")
("startup.directory", &StartupPath, "startup paths containing the JavaScript files; multiple directories can be separated by cola")
@ -597,8 +597,8 @@ static void ParseProgramOptions (int argc, char* argv[]) {
UsePager = true;
}
if (options.has("quite")) {
Quite = true;
if (options.has("quiet")) {
Quiet = true;
}
// set V8 options
@ -1000,7 +1000,7 @@ static void RunShell (v8::Handle<v8::Context> context) {
console->close();
if (Quite) {
if (Quiet) {
printf("\n");
}
else {
@ -1288,7 +1288,7 @@ int main (int argc, char* argv[]) {
// .............................................................................
// http://www.network-science.de/ascii/ Font: ogre
if (! Quite) {
if (! Quiet) {
char const* g = DEF_GREEN;
char const* r = DEF_RED;
char const* z = DEF_RESET;
@ -1332,7 +1332,7 @@ int main (int argc, char* argv[]) {
if (useServer) {
if (ClientConnection->isConnected()) {
if (! Quite) {
if (! Quiet) {
printf("Connected to Arango DB %s:%d Version %s\n",
ClientConnection->getHostname().c_str(),
ClientConnection->getPort(),
@ -1362,8 +1362,7 @@ int main (int argc, char* argv[]) {
StartupLoader.setDirectory(StartupPath);
}
// add the client connection to the context:
context->Global()->Set(v8::String::New("ARANGO_QUITE"), Quite ? v8::True() : v8::False(), v8::ReadOnly);
context->Global()->Set(v8::String::New("ARANGO_QUIET"), Quiet ? v8::True() : v8::False(), v8::ReadOnly);
// load all init files
char const* files[] = {

31
js/client/client.js
View File

@ -302,6 +302,26 @@ function stop_pretty_print () {
}
}
////////////////////////////////////////////////////////////////////////////////
/// @brief start paging
////////////////////////////////////////////////////////////////////////////////
function start_pager () {
var internal = require("internal");
internal.start_pager();
}
////////////////////////////////////////////////////////////////////////////////
/// @brief stop paging
////////////////////////////////////////////////////////////////////////////////
function stop_pager () {
var internal = require("internal");
internal.stop_pager();
}
////////////////////////////////////////////////////////////////////////////////
/// @brief start pretty printing with optional color
////////////////////////////////////////////////////////////////////////////////
@ -340,7 +360,7 @@ function stop_color_print () {
function help () {
var internal = require("internal");
var client = require("argonsh");
var client = require("arangosh");
internal.print(client.HELP);
internal.print(client.helpQueries);
@ -670,7 +690,7 @@ function ArangoStatement (database, data) {
client.helpArangoStatement = client.createHelpHeadline("ArangoStatement help") +
'ArangoStatement constructor: ' + "\n" +
' > st = new ArangoStatement({ "query" : "for ..." }); ' + "\n" +
' > st = new ArangoStatement(db, { "query" : "for ..." }); ' + "\n" +
' > st = db._createStatement({ "query" : "for ..." }); ' + "\n" +
'Functions: ' + "\n" +
' bind(<key>, <value>); bind single variable ' + "\n" +
@ -2612,7 +2632,6 @@ ArangoEdges.prototype = new ArangoDatabase();
' > db.<coll_name>.remove(<_id>); delete a document ' + "\n" +
' > db.<coll_name>.document(<_id>); get a document ' + "\n" +
' > help show help pages ' + "\n" +
' > helpQueries query help ' + "\n" +
' > exit ';
////////////////////////////////////////////////////////////////////////////////
@ -2651,8 +2670,8 @@ ArangoEdges.prototype = new ArangoDatabase();
client.helpExtended = client.createHelpHeadline("More help") +
'Pager: ' + "\n" +
' > internal.stop_pager() stop the pager output ' + "\n" +
' > internal.start_pager() start the pager ' + "\n" +
' > stop_pager() stop the pager output ' + "\n" +
' > start_pager() start the pager ' + "\n" +
'Pretty printing: ' + "\n" +
' > stop_pretty_print() stop pretty printing ' + "\n" +
' > start_pretty_print() start pretty printing ' + "\n" +
@ -2683,7 +2702,7 @@ ArangoEdges.prototype = new ArangoDatabase();
// load simple queries
require("simple-query");
if (! internal.ARANGO_QUITE) {
if (! internal.ARANGO_QUIET) {
internal.print(client.HELP);
}
}

31
js/client/js-client.h
View File

@ -304,6 +304,26 @@ static string JS_client_client =
"}\n"
"\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"/// @brief start paging\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"\n"
"function start_pager () {\n"
" var internal = require(\"internal\");\n"
"\n"
" internal.start_pager();\n"
"}\n"
"\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"/// @brief stop paging\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"\n"
"function stop_pager () {\n"
" var internal = require(\"internal\");\n"
" \n"
" internal.stop_pager();\n"
"}\n"
"\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"/// @brief start pretty printing with optional color\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"\n"
@ -341,7 +361,7 @@ static string JS_client_client =
"\n"
"function help () {\n"
" var internal = require(\"internal\");\n"
" var client = require(\"argonsh\");\n"
" var client = require(\"arangosh\");\n"
"\n"
" internal.print(client.HELP);\n"
" internal.print(client.helpQueries);\n"
@ -671,7 +691,7 @@ static string JS_client_client =
"\n"
" client.helpArangoStatement = client.createHelpHeadline(\"ArangoStatement help\") +\n"
" 'ArangoStatement constructor: ' + \"\\n\" +\n"
" ' > st = new ArangoStatement({ \"query\" : \"for ...\" }); ' + \"\\n\" +\n"
" ' > st = new ArangoStatement(db, { \"query\" : \"for ...\" }); ' + \"\\n\" +\n"
" ' > st = db._createStatement({ \"query\" : \"for ...\" }); ' + \"\\n\" +\n"
" 'Functions: ' + \"\\n\" +\n"
" ' bind(<key>, <value>); bind single variable ' + \"\\n\" +\n"
@ -2613,7 +2633,6 @@ static string JS_client_client =
" ' > db.<coll_name>.remove(<_id>); delete a document ' + \"\\n\" +\n"
" ' > db.<coll_name>.document(<_id>); get a document ' + \"\\n\" +\n"
" ' > help show help pages ' + \"\\n\" +\n"
" ' > helpQueries query help ' + \"\\n\" +\n"
" ' > exit ';\n"
"\n"
"////////////////////////////////////////////////////////////////////////////////\n"
@ -2652,8 +2671,8 @@ static string JS_client_client =
"\n"
" client.helpExtended = client.createHelpHeadline(\"More help\") +\n"
" 'Pager: ' + \"\\n\" +\n"
" ' > internal.stop_pager() stop the pager output ' + \"\\n\" +\n"
" ' > internal.start_pager() start the pager ' + \"\\n\" +\n"
" ' > stop_pager() stop the pager output ' + \"\\n\" +\n"
" ' > start_pager() start the pager ' + \"\\n\" +\n"
" 'Pretty printing: ' + \"\\n\" +\n"
" ' > stop_pretty_print() stop pretty printing ' + \"\\n\" +\n"
" ' > start_pretty_print() start pretty printing ' + \"\\n\" +\n"
@ -2684,7 +2703,7 @@ static string JS_client_client =
" // load simple queries\n"
" require(\"simple-query\");\n"
"\n"
" if (! internal.ARANGO_QUITE) {\n"
" if (! internal.ARANGO_QUIET) {\n"
" internal.print(client.HELP);\n"
" }\n"
" }\n"

8
js/common/bootstrap/js-modules.h
View File

@ -9,7 +9,7 @@ static string JS_common_bootstrap_modules =
"/*global require, module, ModuleCache, SYS_EXECUTE, CONSOLE_ERROR,\n"
" FS_EXISTS, SYS_LOAD, SYS_LOG, SYS_LOG_LEVEL, SYS_OUTPUT,\n"
" SYS_PROCESS_STAT, SYS_READ, SYS_SPRINTF, SYS_TIME,\n"
" SYS_START_PAGER, SYS_STOP_PAGER, ARANGO_QUITE, MODULES_PATH,\n"
" SYS_START_PAGER, SYS_STOP_PAGER, ARANGO_QUIET, MODULES_PATH,\n"
" COLOR_OUTPUT, COLOR_OUTPUT_RESET, COLOR_BRIGHT, PRETTY_PRINT */\n"
"\n"
"////////////////////////////////////////////////////////////////////////////////\n"
@ -289,7 +289,7 @@ static string JS_common_bootstrap_modules =
" internal.start_pager = function() {};\n"
" internal.stop_pager = function() {};\n"
"\n"
" internal.ARANGO_QUITE = false;\n"
" internal.ARANGO_QUIET = false;\n"
"\n"
" internal.COLOR_OUTPUT = undefined;\n"
" internal.COLOR_OUTPUT_RESET = \"\";\n"
@ -305,10 +305,6 @@ static string JS_common_bootstrap_modules =
" internal.stop_pager = SYS_STOP_PAGER;\n"
" }\n"
"\n"
" if (typeof ARANGO_QUITE !== \"undefined\") {\n"
" internal.stop_pager = ARANGO_QUITE;\n"
" }\n"
"\n"
" if (typeof COLOR_OUTPUT !== \"undefined\") {\n"
" internal.COLOR_OUTPUT = COLOR_OUTPUT;\n"
" }\n"

8
js/common/bootstrap/modules.js
View File

@ -8,7 +8,7 @@
/*global require, module, ModuleCache, SYS_EXECUTE, CONSOLE_ERROR,
FS_EXISTS, SYS_LOAD, SYS_LOG, SYS_LOG_LEVEL, SYS_OUTPUT,
SYS_PROCESS_STAT, SYS_READ, SYS_SPRINTF, SYS_TIME,
SYS_START_PAGER, SYS_STOP_PAGER, ARANGO_QUITE, MODULES_PATH,
SYS_START_PAGER, SYS_STOP_PAGER, ARANGO_QUIET, MODULES_PATH,
COLOR_OUTPUT, COLOR_OUTPUT_RESET, COLOR_BRIGHT, PRETTY_PRINT */
////////////////////////////////////////////////////////////////////////////////
@ -288,7 +288,7 @@ ModuleCache["/internal"] = new Module("/internal");
internal.start_pager = function() {};
internal.stop_pager = function() {};
internal.ARANGO_QUITE = false;
internal.ARANGO_QUIET = false;
internal.COLOR_OUTPUT = undefined;
internal.COLOR_OUTPUT_RESET = "";
@ -304,10 +304,6 @@ ModuleCache["/internal"] = new Module("/internal");
internal.stop_pager = SYS_STOP_PAGER;
}
if (typeof ARANGO_QUITE !== "undefined") {
internal.stop_pager = ARANGO_QUITE;
}
if (typeof COLOR_OUTPUT !== "undefined") {
internal.COLOR_OUTPUT = COLOR_OUTPUT;
}