Changeset 57

Timestamp:

1999-09-17 14:18:21 (9 years ago)

Author:

richard

Message:

Added get_termfreq() method to postlists.

Location:

trunk/xapian-core

Files:

• backends/da/da_database.cc (modified) (5 diffs)
• backends/da/da_database.h (modified) (1 diff)
• common/database.h (modified) (1 diff)
• common/omtypes.h (modified) (1 diff)

trunk/xapian-core/backends/da/da_database.cc

@@ -9 +9 @@
 #include "daread.h"
 
-DAPostList::DAPostList(struct postings *pl) {
+DAPostList::DAPostList(struct postings *pl, doccount tf) {
+    termfreq = tf;
     postlist = pl;
     DAreadpostings(postlist, 0, 0);
@@ -16 +17 @@
 DAPostList::~DAPostList() {
     DAclosepostings(postlist);
+}
+
+doccount DAPostList::get_termfreq() {
+    return termfreq;
 }
 
@@ -112 +117 @@
     postlist = DAopenpostings(&ti, DA_t);
 
-    DAPostList * pl = new DAPostList(postlist);
+    DAPostList * pl = new DAPostList(postlist, ti.freq);
     return pl;
 }
@@ -130 +135 @@
     if (!id) {
         id = termidvec.size() + 1;
-        printf("Adding term `%s' as ID %d\n", name.c_str(), id);
+//      printf("Adding term `%s' as ID %d\n", name.c_str(), id);
         termidvec.push_back(name);
         termidmap[name] = id;
     }
-    printf("Looking up term `%s': ID = %d\n", name.c_str(), id);
+//    printf("Looking up term `%s': ID = %d\n", name.c_str(), id);
     return id;
 }
@@ -142 +147 @@
 {
     if (id <= 0 || id > termidvec.size()) throw RangeError("invalid termid");
-    printf("Looking up termid %d: name = `%s'\n", id, termidvec[id - 1].c_str());
+//    printf("Looking up termid %d: name = `%s'\n", id, termidvec[id - 1].c_str());
     return termidvec[id - 1];
 }

trunk/xapian-core/backends/da/da_database.h

@@ -12 +12 @@
         struct postings * postlist;
         docid  currdoc;
+        doccount termfreq;
 
-        DAPostList(struct postings *pl);
+        DAPostList(struct postings *pl, doccount tf);
     public:
         ~DAPostList();
+
+        doccount get_termfreq(); 
 
         docid  get_docid();     // Gets current docid

trunk/xapian-core/common/database.h

@@ -39 +39 @@
     private:
     public:
+        virtual doccount get_termfreq() = 0;// Gets number of docs indexed by this term
+
         virtual docid  get_docid() = 0;     // Gets current docid
         virtual weight get_weight() = 0;    // Gets current weight

trunk/xapian-core/common/omtypes.h

@@ -6 +6 @@
 typedef unsigned int termid;
 typedef unsigned int docid;
+
+typedef docid doccount;
+
 typedef unsigned int weight;