From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 2 Aug 2004 10:12:06 +0000 (+0000)
Subject: Select database before commit takes place to ensure register is selected
X-Git-Tag: ZEBRA.1.3.16~20
X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=433f7360a01640cfdbe09ce7ae19f3319b348bb3

Select database before commit takes place to ensure register is selected
---

diff --git a/index/zserver.c b/index/zserver.c
index ca01ed7..c6dad72 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,4 +1,4 @@
-/* $Id: zserver.c,v 1.116 2004-07-28 08:15:45 adam Exp $
+/* $Id: zserver.c,v 1.117 2004-08-02 10:12:06 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -383,6 +383,10 @@ int bend_delete (void *handle, bend_delete_rr *rr)
 
 static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r)
 {
+    if (r->toKeep->databaseName)
+    {
+	yaz_log(LOG_LOG, "adm request database %s", r->toKeep->databaseName);
+    }
     switch (r->toKeep->which)
     {
     case Z_ESAdminOriginPartToKeep_reIndex:
@@ -409,6 +413,9 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r)
 	break;
     case Z_ESAdminOriginPartToKeep_commit:
 	yaz_log(LOG_LOG, "adm-commit");
+	if (r->toKeep->databaseName)
+	    zebra_select_database(zh, r->toKeep->databaseName);
+	zebra_commit(zh);
 	break;
     case Z_ESAdminOriginPartToKeep_shutdown:
 	yaz_log(LOG_LOG, "shutdown");
@@ -421,10 +428,6 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r)
     default:
 	yaz_log(LOG_LOG, "unknown admin");
     }
-    if (r->toKeep->databaseName)
-    {
-	yaz_log(LOG_LOG, "database %s", r->toKeep->databaseName);
-    }
     return 0;
 }