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

issue #332

This commit is contained in:
Jan Steemann 2012-12-22 02:45:29 +01:00
parent 09e204651e
commit 0f887a39fa
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,6 +1,8 @@
v1.1.2 (XXXX-XX-XX)
-------------------
* fixed issue #332: arangoimp --use-ids parameter seems to have no impact
* added option '--server.disable-authentication' for arangosh as well. No more passwd
prompts if not needed

22
arangod/VocBase/primary-collection.c
View File

@ -116,10 +116,28 @@ static TRI_doc_mptr_t CreateJson (TRI_primary_collection_t* collection,
TRI_json_t* id = TRI_LookupArrayJson((TRI_json_t*) json, "_id");
TRI_json_t* rev = TRI_LookupArrayJson((TRI_json_t*) json, "_rev");
if (id != NULL && id->_type == TRI_JSON_NUMBER &&
if (id != NULL && (id->_type == TRI_JSON_NUMBER || id->_type == TRI_JSON_STRING) &&
rev != NULL && rev->_type == TRI_JSON_NUMBER) {
// read existing document id and revision id from document
did = (TRI_voc_did_t) id->_value._number;
// did
if (id->_type == TRI_JSON_NUMBER) {
did = (TRI_voc_did_t) id->_value._number;
}
else {
TRI_vector_string_t parts = TRI_SplitString(id->_value._string.data, '/');
if (parts._length == 1) {
did = TRI_UInt64String(parts._buffer[0]);
}
else if (parts._length == 2) {
did = TRI_UInt64String(parts._buffer[1]);
}
LOG_INFO("using did %llu", (unsigned long long) did);
TRI_DestroyVectorString(&parts);
}
// rid
rid = (TRI_voc_rid_t) rev->_value._number;
}
}