9717: trunk/xapian-core/ trunk/xapian-core/common/ trunk/xapian-core/matcher/

SVN root:       svn://svn.xapian.org/xapian
Changes by:     richard
Revision:       9717
Date:           2007-11-23 17:46:44 +0000 (Fri, 23 Nov 2007)

Log message (14 lines):
common/stats.h: Add set_termfreq() and set_reltermfreq()
convenience methods to Stats; and remote the take_my_stats(),
my_termfreq_is() and my_reltermfreq_is() methods from
StatsSource.
common/rset.h,matcher/rset.cc: Rename give_stats_to_statssource()
to contribute_stats(), and give it take a Stats object instead of
a StatsSource object.  Can't forward declare Stats, so we need to
#include "stats.h" in rset.h now, unfortunately.
matcher/localmatch.cc,matcher/localmatch.h: Move register_term()
implementation inline into prepare_match().  Build up the
statistics in a local Stats object, rather than passing them
piecemeal to the StatsSource object, and then use
StatsSource::get_my_stats() to set them, just like
RemoteSubMatcher.

Modified files:
U   trunk/xapian-core/ChangeLog
U   trunk/xapian-core/common/rset.h
U   trunk/xapian-core/common/stats.h
U   trunk/xapian-core/matcher/localmatch.cc
U   trunk/xapian-core/matcher/localmatch.h
U   trunk/xapian-core/matcher/rset.cc

Links:
http://xapian.org/C?9717
http://xapian.org/C?9717?trunk/xapian-core/ChangeLog
http://xapian.org/C?9717?trunk/xapian-core/common/rset.h
http://xapian.org/C?9717?trunk/xapian-core/common/stats.h
http://xapian.org/C?9717?trunk/xapian-core/matcher/localmatch.cc
http://xapian.org/C?9717?trunk/xapian-core/matcher/localmatch.h
http://xapian.org/C?9717?trunk/xapian-core/matcher/rset.cc