X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=5352457ae28fb7d59d5d5f01ba5b1916d1d3f27b;hb=e8899adeac7c35feef7b93af73c2026245b2a205;hp=53ed8500f498524f05fc8dc2ad691e49d0d247b0;hpb=0e898c0c6183c6dd9701286f6a4ac9b734c9bdbb;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 53ed850..5352457 100644
--- 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;
 }