fixed bugs, added deletion

CVS patchset: 134
CVS date: 1996/01/05 18:14:52

diff --git a/lib/dbindex.c b/lib/dbindex.c
index 2b35d5b..275f329 100644 (file)
--- a/lib/dbindex.c
+++ b/lib/dbindex.c
@@ -58,14 +58,23 @@ int updateDBIndex(dbIndex * dbi, char * str, dbIndexSet * set) {
     key.data = str;
     key.size = strlen(str);
 
-    data.data = set->recs;
-    data.size = set->count * sizeof(dbIndexRecord);
-
-    rc = dbi->db->put(dbi->db, &key, &data, 0);
-    if (rc) {
-       error(RPMERR_DBPUTINDEX, "error storing record %s into %s",
-               str, dbi->indexname);
-       return 1;
+    if (set->count) {
+       data.data = set->recs;
+       data.size = set->count * sizeof(dbIndexRecord);
+
+       rc = dbi->db->put(dbi->db, &key, &data, 0);
+       if (rc) {
+           error(RPMERR_DBPUTINDEX, "error storing record %s into %s",
+                   str, dbi->indexname);
+           return 1;
+       }
+    } else {
+       rc = dbi->db->del(dbi->db, &key, 0);
+       if (rc) {
+           error(RPMERR_DBPUTINDEX, "error removing record %s into %s",
+                   str, dbi->indexname);
+           return 1;
+       }
     }
 
     return 0;
@@ -94,3 +103,23 @@ dbIndexSet createDBIndexRecord(void) {
 void freeDBIndexRecord(dbIndexSet set) {
     free(set.recs);
 }
+
+int removeDBIndexRecord(dbIndexSet * set, dbIndexRecord rec) {
+    int from;
+    int to = 0;
+    int num = set->count;
+    int numCopied = 0;
+  
+    for (from = 0; from < num; from++) {
+       if (rec.recOffset != set->recs[from].recOffset ||
+           rec.fileNumber != set->recs[from].fileNumber) {
+           if (from != to) set->recs[to] = set->recs[from];
+           to++;
+           numCopied++;
+       } else {
+           set->count--;
+       }
+    }
+
+    return (numCopied == num);
+}

diff --git a/lib/dbindex.h b/lib/dbindex.h
index 286a50a..454cbe1 100644 (file)
--- a/lib/dbindex.h
+++ b/lib/dbindex.h
@@ -28,6 +28,8 @@ int updateDBIndex(dbIndex * dbi, char * str, dbIndexSet * set);
    /* 0 on success */
 int appendDBIndexRecord(dbIndexSet * set, dbIndexRecord rec);
    /* 0 on success - should never fail */
+int removeDBIndexRecord(dbIndexSet * set, dbIndexRecord rec);
+   /* 0 on success - fails if rec is not found */
 dbIndexSet createDBIndexRecord(void);
 void freeDBIndexRecord(dbIndexSet set);