Changeset 75

Timestamp:

1999-09-20 17:12:19 (9 years ago)

Author:

richard

Message:

Reads term lists (untested though)

Location:

trunk/xapian-core

Files:

• backends/da/da_database.cc (modified) (2 diffs)
• backends/da/da_database.h (modified) (1 diff)
• common/database.h (modified) (1 diff)
• tests/dbtest.cc (modified) (2 diffs)

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

@@ -77 +77 @@
 }
 
+
+
+DATermList::DATermList(DADatabase *db, struct termvec *tv) {
+    tvec = tv;
+    dbase = db;
+
+    readterms(tvec);
+}
+
+DATermList::~DATermList() {
+    losetermvec(tvec);
+}
+
+termid DATermList::get_termid() {
+    if(at_end()) throw OmError("Attempt to access beyond end of termlist.");
+
+    char *term = (char *)tvec->term;
+
+    return dbase->term_name_to_id(string(term + 1, (unsigned)term[0]));
+}
+
+void   DATermList::next() {
+    printf("Next\n");
+    readterms(tvec);
+}
+
+bool   DATermList::at_end() {
+    if(tvec->term == 0) return true;
+    return false;
+}
 
 
@@ -156 +186 @@
 {
     if(!opened) throw OmError("DADatabase not opened.");
-    return NULL;
+
+    struct termvec *tv = maketermvec();
+    int found = DAgettermvec(DA_r, id, tv);
+
+    if(found == 0) throw RangeError("Docid not found");
+
+    openterms(tv);
+
+    DATermList *tl = new DATermList(this, tv);
+    return tl;
 }
 

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

@@ -29 +29 @@
 
 class DATermList : public virtual TermList {
+    friend class DADatabase;
+    private:
+        struct termvec * tvec;
+        DADatabase * dbase;
 
+        DATermList(DADatabase *db, struct termvec *tv);
+    public:
+        ~DATermList();
+
+        termid get_termid();
+        void   next();
+        bool   at_end();
 };
 

trunk/xapian-core/common/database.h

@@ -33 +33 @@
         virtual termid get_termid() = 0;    // Gets current termid
         virtual void   next() = 0;          // Moves to next termid
-        virtual void   skip_to(termid) = 0; // Moves to next termid >= specified termid
         virtual bool   at_end() = 0;        // True if we're off the end of the list
 

trunk/xapian-core/tests/dbtest.cc

@@ -8 +8 @@
     DADatabase database;
     PostList * postlist;
+    TermList * termlist;
     termid tid;
+    docid did;
 
     try {
@@ -26 +28 @@
         }
         delete postlist;
+        did = 2510;
+        termlist = database.open_term_list(did);
+        printf("\nTermlist for document %d:\n", did);
+        while(!termlist->at_end()) {
+            termid tid = termlist->get_termid();
+
+            printf("TermId: %d\n", tid);
+            termlist->next();
+        }
+        delete termlist;
         database.close();
     }