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:
gschwab 2014-06-25 11:20:33 +02:00
parent 834a4a5c7c 0c1c747bf4
commit df608be3f9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdParty/icu/source/tools/pkgdata/pkgdata.cpp vendored
View File

@ -1975,7 +1975,7 @@ static void loadLists(UPKGOptions *o, UErrorCode *status)
FILE *p = NULL; FILE *p = NULL;
size_t n; size_t n;
static char buf[512] = ""; static char buf[512] = "";
char cmdBuf[1024]; char cmdBuf[1025];
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
const char cmd[] = "icu-config --incpkgdatafile"; const char cmd[] = "icu-config --incpkgdatafile";

5
Documentation/Books/bot.py
View File

@ -40,14 +40,15 @@ def replaceText(text, pathOfFile, searchText):
# HTTP API changing code # HTTP API changing code
replaced = replaced.replace("@brief","") replaced = replaced.replace("@brief","")
replaced = re.sub(r"@RESTHEADER{([\s\w\/-]*),([\s\w]*)}", r"###\g<2>\n `\g<1>", replaced) replaced = re.sub(r"@RESTHEADER{([\s\w\/\_-]*),([\s\w]*)}", r"###\g<2>\n `\g<1>`", replaced)
replaced = replaced.replace("@RESTDESCRIPTION","") replaced = replaced.replace("@RESTDESCRIPTION","")
replaced = replaced.replace("@RESTURLPARAMS","*URL Parameters*\n") replaced = replaced.replace("@RESTURLPARAMS","*URL Parameters*\n")
replaced = replaced.replace("@RESTQUERYPARAMS","*Query Parameters*\n") replaced = replaced.replace("@RESTQUERYPARAMS","*Query Parameters*\n")
replaced = replaced.replace("@RESTHEADERPARAMS","*Header Parameters*\n") replaced = replaced.replace("@RESTHEADERPARAMS","*Header Parameters*\n")
replaced = replaced.replace("@RESTBODYPARAMS","*Body Parameters*\n") replaced = replaced.replace("@RESTBODYPARAMS","*Body Parameters*\n")
replaced = replaced.replace("@RESTRETURNCODES","*Return Codes*") replaced = replaced.replace("@RESTRETURNCODES","*Return Codes*")
replaced = re.sub(r"@RESTPARAM{([\s\w]*),([\s\w]*),\s*(\w+)}", r"* *\g<1>* (\g<3>):", replaced) replaced = re.sub(r"@RESTPARAM{([\s\w\-]*),([\s\w\_\|-]*),\s[optional]}", r"* *\g<1>* (\g<3>):", replaced)
replaced = re.sub(r"@RESTPARAM{([\s\w-]*),([\s\w\_\|-]*),\s*(\w+)}", r"* *\g<1>*:", replaced)
# replaced = re.sub(r"@RESTPARAM{(\s*\w+\-*\w+),(\s*\w+),\s*(\w+)}", r"* *\g<1>* (\g<3>):", replaced) # replaced = re.sub(r"@RESTPARAM{(\s*\w+\-*\w+),(\s*\w+),\s*(\w+)}", r"* *\g<1>* (\g<3>):", replaced)
replaced = re.sub(r"@RESTRETURNCODE{(.*)}", r"* *HTTP \g<1>*:", replaced) replaced = re.sub(r"@RESTRETURNCODE{(.*)}", r"* *HTTP \g<1>*:", replaced)
replaced = re.sub(r"@RESTBODYPARAMS{(.*)}", r"*(\g<1>)*", replaced) replaced = re.sub(r"@RESTBODYPARAMS{(.*)}", r"*(\g<1>)*", replaced)