Renamed API function zebra_deleleResultSet to zebra_deleteResultSet.

[idzebra-moved-to-github.git] / index / zebraapi.c

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 0ca84e6..72477ca 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.147 2005-01-15 19:56:54 adam Exp $
+/* $Id: zebraapi.c,v 1.151 2005-01-22 12:20:34 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -984,22 +984,22 @@ int zebra_sort (ZebraHandle zh, ODR stream,
     return 0;
 }
 
-int zebra_deleleResultSet(ZebraHandle zh, int function,
+int zebra_deleteResultSet(ZebraHandle zh, int function,
                          int num_setnames, char **setnames,
                          int *statuses)
 {
     int i, status;
     ASSERTZH;
-    assert(num_setnames>0);
-    assert(setnames);
     assert(statuses);
-    yaz_log(log_level, "zebra_deleleResultSet n=%d",num_setnames);
+    yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
     zh->errCode = 0;
     if (zebra_begin_read(zh))
        return Z_DeleteStatus_systemProblemAtTarget;
     switch (function)
     {
     case Z_DeleteResultSetRequest_list:
+       assert(num_setnames>0);
+       assert(setnames);
        resultSetDestroy (zh, num_setnames, setnames, statuses);
        break;
     case Z_DeleteResultSetRequest_all:
@@ -1402,6 +1402,16 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
     ASSERTZH;
     if (!zh->res)
     {
+       /* no database has been selected - so we select based on
+          resource setting (including group)
+       */
+       const char *group = res_get(zh->service->global_res, "group");
+       const char *v = res_get_prefix(zh->service->global_res,
+                                      "database", group, "Default");
+       zebra_select_database(zh, v);
+    }
+    if (!zh->res)
+    {
         zh->errCode = 2;
         zh->errString = "zebra_begin_trans: no database selected";
         return -1;