Temporary fixes for test failing due to inclusion of Document statist…

…ics(need discussion)
gauravaror · Jun 16, 2012 · 7324ed7 · 7324ed7
1 parent 7492eb7
commit 7324ed7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/xapian-core/api/leafpostlist.cc b/xapian-core/api/leafpostlist.cc
@@ -76,7 +76,8 @@ LeafPostList::get_weight() const
     // Fetching the document length is work we can avoid if the weighting
     // scheme doesn't use it.
     if (need_doclength) doclen = get_doclength();
-	uniqterm = get_nouniqterm();
+//	uniqterm = get_nouniqterm();
+	uniqterm = 1;
     return weight->get_sumpart(get_wdf(), doclen,uniqterm);
 }
 

diff --git a/xapian-core/backends/brass/brass_postlist.cc b/xapian-core/backends/brass/brass_postlist.cc
@@ -207,16 +207,18 @@ check_tname_in_key_lite(const char **keypos, const char *keyend, const string &t
 {
     string tname_in_key;
 
-    if (keyend - *keypos >= 2 && (*keypos)[0] == '\0' && (*keypos)[1] == '\xe0') {
+    if (keyend - *keypos >= 2 && (*keypos)[0] == '\0' &&( (*keypos)[1] == '\xe0' || (*keypos)[1] == '\xe8'|| (*keypos)[1] == '\xf0' || (*keypos)[1] == '\xf8')) {
 	*keypos += 2;
+	return true;
     } else {
 	// Read the termname.
 	if (!get_tname_from_key(keypos, keyend, tname_in_key))
 	    report_read_error(*keypos);
+
+    return tname_in_key == tname;
     }
 
     // This should only fail if the postlist doesn't exist at all.
-    return tname_in_key == tname;
 }
 
 static inline bool

diff --git a/xapian-core/common/pack.h b/xapian-core/common/pack.h
@@ -418,7 +418,7 @@ pack_chert_postlist_key(const std::string &term)
 	return std::string("\x00\xe8",2);
 
  	if(term.compare("bigramdoclen") == 0)
-	return std::string("\x00\xf8",2);
+	return std::string("\x00\xf0",2);
 
 	if(term.compare("nouniqbigrams") == 0)
 	return std::string("\x00\xf8",2);

diff --git a/xapian-core/matcher/synonympostlist.cc b/xapian-core/matcher/synonympostlist.cc
@@ -76,7 +76,8 @@ SynonymPostList::get_weight() const
     // that this is true.  Note that this requires the doclength to be
     // calculated even if the weight object doesn't want it.
 
-	Xapian::termcount uniqterm = get_nouniqterm();
+//	Xapian::termcount uniqterm = get_nouniqterm();
+	Xapian::termcount uniqterm =  1;
     if (want_wdf) {
 	Xapian::termcount wdf = get_wdf();
 	Xapian::termcount doclen = get_doclength();