Changeset 320

Timestamp:

02/29/08 02:19:22 (9 months ago)

Author:

jake

Message:

removed asserts

Location:

trunk/thrudex/src

Files:

• CLuceneBackend.cpp (modified) (1 diff)
• CLuceneIndex.cpp (modified) (4 diffs)

trunk/thrudex/src/CLuceneBackend.cpp

@@ -103 +103 @@
 
         wstring doc_key     = build_wstring( d.key );
-        assert( !doc_key.empty() );
+
+        if( doc_key.empty() ){
+            ThrudexException ex;
+            ex.what = "Missing key";
+
+            throw ex;
+        }
 
 

trunk/thrudex/src/CLuceneIndex.cpp

@@ -272 +272 @@
     LOG4CXX_DEBUG(logger,"Searching in: ("+q.index+")");
 
+
+    if( q.query.empty() ){
+        ThrudexException ex;
+        ex.what = "Query is empty";
+        throw ex;
+    }
+
     shared_ptr<CLuceneRAMDirectory> l_ram_prev_directory = ram_prev_directory;
 
@@ -280 +287 @@
 
     try{
-
-        assert( !q.query.empty() );
 
         LOG4CXX_DEBUG(logger,q.query);
@@ -355 +360 @@
 
                 if(id == NULL){
-                    assert(id != NULL);
+                    //assert(id != NULL);
                     continue;
                 } else {
@@ -383 +388 @@
 
                 if(id == NULL) {
-                    assert(id != NULL);
+                    //assert(id != NULL);
                     continue;
                 } else {