Added a few files to be ignored

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

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 53ed850..5352457 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.164 2005-05-03 09:11:34 adam Exp $
+/* $Id: zebraapi.c,v 1.167 2005-05-09 10:16:13 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -147,7 +147,7 @@ ZebraHandle zebra_open (ZebraService zs)
 
     zh->store_data_buf = 0;
 
-    zh->m_limit = zebra_limit_create(0, 0);
+    zh->m_limit = zebra_limit_create(1, 0);
 
     return zh;
 }
@@ -652,6 +652,20 @@ static void zebra_select_register (ZebraHandle zh, const char *new_reg)
         zh->lock_shadow =
             zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
 
+       if (!zh->lock_normal || !zh->lock_shadow)
+       {
+           if (zh->lock_normal)
+           {
+               zebra_lock_destroy(zh->lock_normal);
+               zh->lock_normal = 0;
+           }
+           if (zh->lock_shadow)
+           {
+               zebra_lock_destroy(zh->lock_shadow);
+               zh->lock_shadow = 0;
+           }
+           zebra_close_res(zh);
+       }
     }
 }
 
@@ -697,7 +711,7 @@ int zebra_select_default_database(ZebraHandle zh)
        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);
+       return zebra_select_database(zh, v);
     }
     return 0;
 }
@@ -2184,10 +2198,10 @@ struct BFiles_struct *zebra_get_bfs(ZebraHandle zh)
 /* ---------------------------------------------------------------------------
   Set limit for search/scan
 */
-ZEBRA_RES zebra_set_limit(ZebraHandle zh, int exclude_flag, zint *ids)
+ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids)
 {
     ASSERTZH;
     zebra_limit_destroy(zh->m_limit);
-    zh->m_limit = zebra_limit_create(exclude_flag, ids);
+    zh->m_limit = zebra_limit_create(complement_flag, ids);
     return ZEBRA_OK;
 }