Changeset 299

Timestamp:

02/22/08 21:36:34 (9 months ago)

Author:

jake

Message:

If filter in memory index was all duplicates of disk, it would show 0 results

Location:

trunk/thrudex/src

Files:

• CLuceneBackend.cpp (modified) (1 diff)
• UpdateFilter.cpp (modified) (2 diffs)
• thrudex.conf (modified) (1 diff)

trunk/thrudex/src/CLuceneBackend.cpp

@@ -195 +195 @@
 
         for(unsigned int i=0; i<name.size(); i++){
-            if( !isascii(name[i]) )
-                name[i] = '_';
+            if( !isascii(name[i]) ){
+                ThrudexException ex;
+                ex.what = "Index name contains non-ascii chars";
+                throw ex;
+            }
 
 
             if(name[i] == '\t' || name[i] == '|' || name[i] == '\n' || name[i] == '.' ||
-               name[i] == '\\' || name[i] == '/' )
-                name[i] = '_';
-
-            name[i] = tolower(name[i]);
+               name[i] == '\\' || name[i] == '/' ){
+
+                ThrudexException ex;
+                ex.what = "Index name contains illegal chars";
+                throw ex;
+            }
+
+
         }
 

trunk/thrudex/src/UpdateFilter.cpp

@@ -26 +26 @@
 BitSet* UpdateFilter::bits(IndexReader* reader)
 {
-    if(reader->maxDoc() == this->reader->maxDoc())
+
+    //Disk updates are all that should be filtered
+    if(reader == this->reader.get()){
         return bitset.get();
-    else
-        return NULL;
+    } else {
+        //this is a in memory index no filter
+        BitSet *tmp_bs = new BitSet(reader->maxDoc());
+        for(int i=0; i<reader->maxDoc(); i++)
+            tmp_bs->set(i,true);
+
+        return tmp_bs;
+    }
 }
 
@@ -66 +74 @@
 
 
-bool UpdateFilter::shouldDeleteBitSet(const BitSet* /* bs */) const
+bool UpdateFilter::shouldDeleteBitSet(const BitSet* bs ) const
 {
-    return false;
+    //allow caller to delete tmp bitset only
+    return bs == bitset.get() ? false : true;
 }
 

trunk/thrudex/src/thrudex.conf

@@ -16 +16 @@
 
 # Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=DEBUG, A1
-#log4j.rootLogger=INFO, A1
+#log4j.rootLogger=DEBUG, A1
+log4j.rootLogger=INFO, A1
 
 # A1 is set to be a ConsoleAppender.