Removed bug ,if stemmer is not set bigrams were not addedd

gauravaror · Aug 19, 2012 · f0e97e9 · f0e97e9
1 parent 8880ea2
commit f0e97e9
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/xapian-core/examples/simpleindex.cc b/xapian-core/examples/simpleindex.cc
@@ -56,8 +56,8 @@ try {
     indexer.set_stemmer(stemmer);
 	Xapian::SimpleStopper stopper;
 
-	Xapian::BigramIterator bi  = db1.bigramlist_begin(Xapian::docid(1));
-	while(bi != db1.bigramlist_end(1))
+	Xapian::TermIterator bi  = db1.termlist_begin(Xapian::docid(1));
+	while(bi != db1.termlist_end(1))
 	{
 	cout<<"Bigram"<<*bi<<"\n";
 	bi++;

diff --git a/xapian-core/queryparser/termgenerator_internal.cc b/xapian-core/queryparser/termgenerator_internal.cc
@@ -294,6 +294,7 @@ TermGenerator::Internal::index_text(Utf8Iterator itor, termcount wdf_inc,
 	       }
 		}
 	}	
+	prevterm = term;
 	if ((flags & FLAG_SPELLING) && prefix.empty()) db.add_spelling(term);
 
 	if (strategy == TermGenerator::STEM_NONE ||
@@ -330,7 +331,6 @@ TermGenerator::Internal::index_text(Utf8Iterator itor, termcount wdf_inc,
 		}
 	    doc.add_term(stem, wdf_inc);
 	}
-	prevterm = term;
 	prevstem = stem;
     }
 }

diff --git a/xapian-core/tests/api_bigram.cc b/xapian-core/tests/api_bigram.cc
@@ -114,3 +114,35 @@ DEFINE_TESTCASE(bigramtest2, backend) {
 	}
 	return false;
 }
+
+DEFINE_TESTCASE(bigramtest3, backend) {
+	//To identify bug(in unit testing) if stemmer is not set then bigrams were not added. 
+	SKIP_TEST_FOR_BACKEND("chert");
+	SKIP_TEST_FOR_BACKEND("inmemory");
+    mkdir(".brass", 0755);
+    string dbdir = ".brass/bigramtest2";
+    Xapian::WritableDatabase db(Xapian::Brass::open(dbdir, Xapian::DB_CREATE_OR_OVERWRITE));
+    Xapian::TermGenerator indexer;
+    Xapian::Document doc;
+    filebuf fb;
+	fb.open ("testdata/apitest_simpledata.txt",ios::in);
+    istream bigramfile(&fb);
+	string text =  get_paragraph(bigramfile);
+	doc.set_data(text);
+	indexer.set_bigrams(true);
+    indexer.set_document(doc);	
+	indexer.set_database(db);
+	indexer.index_text(text);
+	Xapian::docid docid1 = db.add_document(doc);
+	Xapian::TermIterator bi = db.termlist_begin(docid1);
+	tout<<"jdk"<<docid1;
+	while(bi != db.termlist_end(docid1)) {
+	string bigramterm = *bi;
+	tout<<bigramterm<<endl;
+	if( bigramterm.compare("mention banana") == 0) {
+		return true;
+	}
+	bi++;
+	}
+	return false;
+}