1
0
Fork 0

added rename

This commit is contained in:
Frank Celler 2012-03-23 12:52:09 +01:00
parent bd0ade543b
commit 4aa24404b9
5 changed files with 30 additions and 2 deletions

View File

@ -5323,6 +5323,7 @@ void TRI_InitV8VocBridge (v8::Handle<v8::Context> context, TRI_vocbase_t* vocbas
v8::Handle<v8::String> NextRefFuncName = v8::Persistent<v8::String>::New(v8::String::New("nextRef"));
v8::Handle<v8::String> OutEdgesFuncName = v8::Persistent<v8::String>::New(v8::String::New("outEdges"));
v8::Handle<v8::String> ParameterFuncName = v8::Persistent<v8::String>::New(v8::String::New("parameter"));
v8::Handle<v8::String> RenameFuncName = v8::Persistent<v8::String>::New(v8::String::New("rename"));
v8::Handle<v8::String> PersistFuncName = v8::Persistent<v8::String>::New(v8::String::New("persist"));
v8::Handle<v8::String> RenameFuncName = v8::Persistent<v8::String>::New(v8::String::New("rename"));
v8::Handle<v8::String> ReplaceFuncName = v8::Persistent<v8::String>::New(v8::String::New("replace"));

View File

@ -394,6 +394,29 @@ TRI_collection_t* TRI_CreateCollection (TRI_collection_t* collection,
return NULL;
}
// simple collection use the collection identifier
else if (parameter->_type == TRI_COL_TYPE_SIMPLE_DOCUMENT) {
tmp1 = TRI_StringUInt64(parameter->_cid);
tmp2 = TRI_Concatenate2String("collection-", tmp1);
filename = TRI_Concatenate2File(path, tmp2);
TRI_FreeString(tmp2);
TRI_FreeString(tmp1);
}
// uups
else {
TRI_set_errno(TRI_ERROR_AVOCADO_UNKNOWN_COLLECTION_TYPE);
LOG_ERROR("cannot create collection '%s' in '%s': unknown type '%d'",
parameter->_name,
path,
(unsigned int) parameter->_type);
return NULL;
}
// directory must not exists
if (TRI_ExistsFile(filename)) {
TRI_set_errno(TRI_ERROR_AVOCADO_COLLECTION_DIRECTORY_ALREADY_EXISTS);

View File

@ -374,6 +374,12 @@ TRI_vocbase_col_t* TRI_UseCollectionByNameVocBase (TRI_vocbase_t* vocbase, char
void TRI_ReleaseCollectionVocBase (TRI_vocbase_t* vocbase, TRI_vocbase_col_t* col);
////////////////////////////////////////////////////////////////////////////////
/// @brief renames a (document) collection
////////////////////////////////////////////////////////////////////////////////
int TRI_RenameCollectionVocBase (TRI_vocbase_t* vocbase, TRI_vocbase_col_t* col, char const* name);
////////////////////////////////////////////////////////////////////////////////
/// @}
////////////////////////////////////////////////////////////////////////////////

View File

@ -212,7 +212,6 @@ static string JS_server_server =
"////////////////////////////////////////////////////////////////////////////////\n"
"\n"
"AvocadoCollection.prototype._PRINT = function() {\n"
" var status = \"unknown\";\n"
"\n"
" switch (this.status()) {\n"
" case AvocadoCollection.STATUS_NEW_BORN: status = \"new born\"; break;\n"

View File

@ -211,7 +211,6 @@ AvocadoCollection.prototype.drop = function() {
////////////////////////////////////////////////////////////////////////////////
AvocadoCollection.prototype._PRINT = function() {
var status = "unknown";
switch (this.status()) {
case AvocadoCollection.STATUS_NEW_BORN: status = "new born"; break;