X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=57edb02999dad652200c874d1ec7e718846c3260;hb=6e098b17d8074bd3201d55ba70eeaa49ce3ed583;hp=26ac71285a02197c08733057c5a495f53142dd09;hpb=583fe2d2582ab4078527c152b232ddf359336e91;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 26ac712..57edb02 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.68 2002-08-28 19:52:29 adam Exp $
+/* $Id: zebraapi.c,v 1.72 2002-09-13 11:40:35 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -130,9 +130,7 @@ ZebraService zebra_start (const char *configName)
 
     yaz_log (LOG_LOG, "zebra_start %s", configName);
 
-    if (!(res = res_open (configName, 0)))
-	yaz_log (LOG_WARN, "Cannot read resources `%s'", configName);
-    else
+    if ((res = res_open (configName, 0)))
     {
         ZebraService zh = xmalloc (sizeof(*zh));
 
@@ -867,6 +865,8 @@ int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
 
 void zebra_admin_import_begin (ZebraHandle zh, const char *database)
 {
+    if (zebra_select_database(zh, database))
+        return;
     zebra_begin_trans (zh);
     xfree (zh->admin_databaseName);
     zh->admin_databaseName = xstrdup(database);
@@ -917,6 +917,8 @@ void zebra_admin_create (ZebraHandle zh, const char *database)
 {
     ZebraService zs;
 
+    if (zebra_select_database (zh, database))
+        return;
     zebra_begin_trans (zh);
 
     zs = zh->service;
@@ -961,7 +963,7 @@ void zebra_set_state (ZebraHandle zh, int val, int seqno)
     fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
     f = fopen (fname, "w");
 
-    yaz_log (LOG_LOG, "%c %d %ld", val, seqno, p);
+    yaz_log (LOG_DEBUG, "%c %d %ld", val, seqno, p);
     fprintf (f, "%c %d %ld\n", val, seqno, p);
     fclose (f);
     xfree (fname);
@@ -1213,10 +1215,8 @@ void zebra_end_trans (ZebraHandle zh)
 
 void zebra_repository_update (ZebraHandle zh)
 {
-    zebra_begin_trans (zh);
     logf (LOG_LOG, "updating %s", zh->rGroup.path);
     repositoryUpdate (zh);    
-    zebra_end_trans (zh);
 }
 
 void zebra_repository_delete (ZebraHandle zh)