From: adam <adamansky@gmail.com>
Date: Sat, 13 Jul 2013 16:30:08 +0000 (+0700)
Subject: merged with master
X-Git-Tag: v1.2.12~287
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6737f42a84adb50717d2f328b12968fc28cf2c91;p=platform%2Fupstream%2Fejdb.git

merged with master
---

6737f42a84adb50717d2f328b12968fc28cf2c91
diff --cc tcejdb/ejdb.h
index fd8ecf5,df9deba..7aaea62
--- a/tcejdb/ejdb.h
+++ b/tcejdb/ejdb.h
@@@ -436,22 -495,9 +496,26 @@@ EJDB_EXPORT bool ejdbtranabort(EJCOLL *
  /** Get current transaction status, it will be placed into txActive*/
  EJDB_EXPORT bool ejdbtranstatus(EJCOLL *jcoll, bool *txactive);
  
 +
+ /** Gets description of EJDB database and its collections. */
+ EJDB_EXPORT bson* ejdbmeta(EJDB *jb);
+ 
++
 +/** Export settings */
 +enum {
 +    JBJSONEXPORT = 1 //If set json collection data will be exported into JSON instead of BSON
 +};
 +
 +/**
 + * Export database data to the specified location. Read lock will be taken on each collection
 + * @param path Directory name in which data will exported.
 + * @param colnames List of collection names to export. If NULL all collections will be exported.
 + * @param flags. Reserved for future use.
 + * @return on sucess `true`
 + */
 +EJDB_EXPORT bool ejdbexport(EJDB *jb, const char *path, TCLIST *cnames, int flags);
 +
 +
  EJDB_EXTERN_C_END
  
  #endif        /* EJDB_H */