Changeset 52

Timestamp:

1999-09-17 10:58:08 (9 years ago)

Author:

richard

Message:

Reads postlists from DA files.

Location:

trunk/xapian-core

Files:

• backends/da/da_database.cc (modified) (2 diffs)
• tests/dbtest.cc (modified) (2 diffs)

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

@@ -11 +11 @@
 DAPostList::DAPostList(struct postings *pl) {
     postlist = pl;
-    //currdoc  = da_postlist_nextitem(pl);
+    DAreadpostings(postlist, 0, 0);
 }
 
@@ -20 +20 @@
 docid DAPostList::get_docid() {
     if(at_end()) throw OmError("Attempt to access beyond end of postlist.");
-    return currdoc;
+    return postlist->Doc;
 }
 
 weight DAPostList::get_weight() {
     if(at_end()) throw OmError("Attempt to access beyond end of postlist.");
-    return 1;
+    return postlist->wdf;
 }
 
 void DAPostList::next() {
     if(at_end()) throw OmError("Attempt to access beyond end of postlist.");
-    //currdoc = da_postlist_nextitem(postlist);
+    DAreadpostings(postlist, 0, 0);
 }
 
 void DAPostList::skip_to(docid id) {
     if(at_end()) throw OmError("Attempt to access beyond end of postlist.");
-    while (!at_end() && get_docid() < id) {
-        next();
-    }
+    DAreadpostings(postlist, 0, id);
 }
 
 bool DAPostList::at_end() {
-    if(currdoc == 0) return true;
+    if(postlist->Doc == MAXINT) return true;
     return false;
 }

trunk/xapian-core/tests/dbtest.cc

@@ -12 +12 @@
     try {
         database.open("testdir", 0);
-        tid = database.term_name_to_id("a");
+        tid = database.term_name_to_id("abhor");
         // posting list 122 141 142 174 ...
         postlist = database.open_post_list(tid);
@@ -22 +22 @@
             wt = postlist->get_weight();
             printf("TermId: %d  DocId: %d  Weight: %d\n", tid, did, wt);
-            if(did == 2) postlist->skip_to(5);
+            if(did == 120) postlist->skip_to(144);
             else postlist->next();
         }