X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=b4cade11ab5c928df8f3436a3c8db822aa25b965;hp=adc9b6a02df676ffaba957cc6e4dc7df51b25d34;hb=6a0f9234f945bc4956e2bcef75f715661a9eba9a;hpb=f3f94568869a1ae0402bfa4f0dea4d80b09695df

diff --git a/index/zebraapi.c b/index/zebraapi.c
index adc9b6a..b4cade1 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,5 +1,5 @@
 /* This file is part of the Zebra server.
-   Copyright (C) 1995-2008 Index Data
+   Copyright (C) 1994-2009 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -1427,7 +1427,6 @@ int delete_w_handle(const char *info, void *handle)
 {
     ZebraHandle zh = (ZebraHandle) handle;
     ISAM_P pos;
-    ASSERTZH;
 
     if (*info == sizeof(pos))
     {
@@ -1437,6 +1436,32 @@ int delete_w_handle(const char *info, void *handle)
     return 0;
 }
 
+int delete_w_all_handle(const char *info, void *handle)
+{
+    ZebraHandle zh = (ZebraHandle) handle;
+    ISAM_P pos;
+
+    if (*info == sizeof(pos))
+    {
+        ISAMB_PP pt;
+	memcpy(&pos, info+1, sizeof(pos));
+        pt = isamb_pp_open(zh->reg->isamb, pos, 2);
+        if (pt)
+        {
+            struct it_key key;
+            key.mem[0] = 0;
+            while (isamb_pp_read(pt, &key))
+            {
+                Record rec;
+                rec = rec_get(zh->reg->records, key.mem[0]);
+                rec_del(zh->reg->records, &rec);
+            }
+            isamb_pp_close(pt);
+        }
+    }
+    return delete_w_handle(info, handle);
+}
+
 static int delete_SU_handle(void *handle, int ord,
                             const char *index_type, const char *string_index,
                             zinfo_index_category_t cat)
@@ -1445,23 +1470,18 @@ static int delete_SU_handle(void *handle, int ord,
     char ord_buf[20];
     int ord_len;
 #if 0
-    const char *index_type = 0;
-    const char *db = 0;
-    const char *string_index = 0;
-    zebraExplain_lookup_ord(zh->reg->zei, ord,
-                            &index_type, &db, &string_index);
-    yaz_log(YLOG_LOG, 
-            "delete_SU_handle:: ord=%d index_type=%s db=%s string_index=%s",
-            ord, index_type, db, string_index);
-#endif
     yaz_log(YLOG_LOG, "ord=%d index_type=%s index=%s cat=%d", ord,
             index_type, string_index, (int) cat);
+#endif
     ord_len = key_SU_encode(ord, ord_buf);
     ord_buf[ord_len] = '\0';
 
     assert(zh->reg->isamb);
+    assert(zh->reg->records);
     dict_delete_subtree(zh->reg->dict, ord_buf,
-			zh, delete_w_handle);
+			zh, 
+                        !strcmp(string_index, "_ALLRECORDS") ?
+                        delete_w_all_handle : delete_w_handle);
     return 0;
 }
 
@@ -2281,7 +2301,6 @@ ZEBRA_RES zebra_update_record(ZebraHandle zh,
 	return ZEBRA_FAIL;
     res = zebra_buffer_extract_record(zh, buf, buf_size, 
                                       action,
-                                      0, /* test_mode */
                                       recordType,
                                       sysno,   
                                       match, 
@@ -2433,6 +2452,7 @@ void zebra_lock_prefix(Res res, char *path)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab