From: adam <anton@adamansky.com>
Date: Sat, 3 Nov 2012 17:47:03 +0000 (+0700)
Subject: #1
X-Git-Tag: v1.2.12~643^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d55d0ea7d002aec7bbdb45ede176a872d4473895;p=platform%2Fupstream%2Fejdb.git

#1
---

diff --git a/node/ejdb_native.cc b/node/ejdb_native.cc
index f37ed1d..8350899 100644
--- a/node/ejdb_native.cc
+++ b/node/ejdb_native.cc
@@ -1107,7 +1107,7 @@ finish:
             if (rsz == 0) {
                 return scope.Close(ThrowException(Exception::Error(String::New("Empty cursor"))));
             }
-            assert(pos < 0 || pos >= rsz); //m_pos correctly set by s_set_pos
+            assert(!(pos < 0 || pos >= rsz)); //m_pos correctly set by s_set_pos
             void *bsdata = TCLISTVALPTR(c->m_rs, pos);
             assert(bsdata);
             bson_iterator it;
@@ -1129,7 +1129,7 @@ finish:
             if (rsz == 0) {
                 return scope.Close(ThrowException(Exception::Error(String::New("Empty cursor"))));
             }
-            assert(pos < 0 || pos >= rsz); //m_pos correctly set by s_set_pos
+            assert(!(pos < 0 || pos >= rsz)); //m_pos correctly set by s_set_pos
             const void *bsdata = TCLISTVALPTR(c->m_rs, pos);
             assert(bsdata);
             bson_iterator it;
diff --git a/node/nbproject/configurations.xml b/node/nbproject/configurations.xml
index bd5be3b..f5b6b8d 100644
--- a/node/nbproject/configurations.xml
+++ b/node/nbproject/configurations.xml
@@ -63,8 +63,6 @@
                   </df>
                   <df name="imgcat">
                   </df>
-                  <df name="progress">
-                  </df>
                 </df>
                 <df name="lib">
                 </df>
@@ -155,27 +153,6 @@
                 <df name="bin">
                 </df>
                 <df name="legacy">
-                  <df name="tools">
-                    <df name="gyp">
-                      <df name="buildbot">
-                      </df>
-                      <df name="pylib">
-                        <df name="gyp">
-                          <df name="generator">
-                          </df>
-                        </df>
-                      </df>
-                      <df name="samples">
-                      </df>
-                      <df name="tools">
-                        <df name="Xcode">
-                          <df name="Specifications">
-                          </df>
-                        </df>
-                      </df>
-                      <in>gyp_dummy.c</in>
-                    </df>
-                  </df>
                 </df>
                 <df name="lib">
                 </df>
@@ -459,7 +436,6 @@
                   <in>rc4-x86_64.asm</in>
                 </df>
                 <df name="sha">
-                  <in>sha1-x86_64.asm</in>
                   <in>sha512-x86_64.asm</in>
                 </df>
                 <df name="whrlpool">
@@ -484,10 +460,6 @@
                 <df name="cast">
                   <in>cast-586.s</in>
                 </df>
-                <df name="des">
-                  <in>crypt586.s</in>
-                  <in>des-586.s</in>
-                </df>
                 <df name="md5">
                   <in>md5-586.s</in>
                 </df>
@@ -1696,8 +1668,6 @@
                 </df>
                 <df name="HOWTO">
                 </df>
-                <df name="ssl">
-                </df>
               </df>
               <df name="engines">
                 <df name="ccgost">
@@ -3091,8 +3061,6 @@
               <df name="dir">
               </df>
             </df>
-            <df name="test-init-index">
-            </df>
             <df name="test-init-native">
             </df>
           </df>
@@ -3160,8 +3128,6 @@
                 </df>
                 <df name="lib">
                 </df>
-                <df name="man">
-                </df>
               </df>
               <df name="mkdirp">
                 <df name="examples">
@@ -3234,17 +3200,6 @@
           </df>
         </df>
       </df>
-      <df name="tests">
-      </df>
-      <df name="win32">
-        <in>pthread_mutex.h</in>
-      </df>
-      <in>ejdb_args.h</in>
-      <in>ejdb_cmd.h</in>
-      <in>ejdb_logging.cc</in>
-      <in>ejdb_logging.h</in>
-      <in>ejdb_native.cc</in>
-      <in>ejdb_thread.h</in>
     </df>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
diff --git a/node/tests/t2.js b/node/tests/t2.js
index 3f4b04d..f163ecb 100644
--- a/node/tests/t2.js
+++ b/node/tests/t2.js
@@ -55,6 +55,9 @@ module.exports.testQuery1 = function(test) {
         var c = 0;
         while (cursor.next()) {
             ++c;
+            var rv = cursor.object();
+            test.ok(rv);
+            test.ok(rv["_id"]);
         }
         test.equal(c, 2);