Changeset 55

Timestamp:

1999-09-17 12:11:44 (9 years ago)

Author:

richard

Message:

Changed termname to be a string, so that map works correctly.

Location:

trunk/xapian-core

Files:

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

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

@@ -97 +97 @@
     termname name = term_id_to_name(id);
 
-    int len = strlen(name);
+    int len = name.length();
     if(len > 126) throw OmError("Term too long for DA implementation.");
     byte * k = (byte *) malloc(len + 1);
     if(k == NULL) throw OmError(strerror(ENOMEM));
     k[0] = len + 1;
-    memcpy(k + 1, name, len);
+    memcpy(k + 1, name.c_str(), len);
 
     struct terminfo ti;
@@ -126 +126 @@
 {
     termid id;
+
     id = termidmap[name];
     if (!id) {
         id = termidvec.size() + 1;
+        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, id);
+    printf("Looking up term `%s': ID = %d\n", name.c_str(), id);
     return id;
 }
@@ -140 +142 @@
 {
     if (id <= 0 || id > termidvec.size()) throw RangeError("invalid termid");
-    printf("Looking up termid %d: name = `%s'\n", id, termidvec[id - 1]);
+    printf("Looking up termid %d: name = `%s'\n", id, termidvec[id - 1].c_str());
     return termidvec[id - 1];
 }

trunk/xapian-core/common/omtypes.h

@@ -6 +6 @@
 typedef unsigned int termid;
 typedef unsigned int docid;
-typedef char *termname;
 typedef unsigned int weight;
 
+#ifdef __cplusplus
+typedef string termname;
+#endif
+
 #endif /* _omtypes_h_ */