X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Fzserver.c;h=4a44d06352f26940466fd006e002cd59c6ee8be7;hb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38;hp=ca01ed7c66ecdb05af5b91506225d3960f70a727;hpb=4a3a97df9d47b8d099e403308f8015f130366994;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index ca01ed7..4a44d06 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.118 2004-08-04 08:35:24 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;
 }
 
@@ -539,7 +542,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
 		    Z_External *rec = notToKeep->elements[i]->record;
                     struct oident *oident = 0;
                     Odr_oct *opaque_recid = 0;
-		    int sysno = 0;
+		    SYSNO sysno = 0;
 
 		    if (notToKeep->elements[i]->u.opaque)
 		    {