Make remote adm-import and adm-create work again (via Extended Services)

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 404b3db..57edb02 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.71 2002-09-13 11:03:46 heikki 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
 
@@ -865,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);
@@ -915,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;

diff --git a/index/zserver.c b/index/zserver.c
index 8e489d4..7214a50 100644 (file)
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,4 +1,4 @@
-/* $Id: zserver.c,v 1.96 2002-09-09 09:35:17 adam Exp $
+/* $Id: zserver.c,v 1.97 2002-09-13 11:40:35 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -358,7 +358,7 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r)
        yaz_log(LOG_LOG, "adm-drop");
        break;
     case Z_ESAdminOriginPartToKeep_create:
-       yaz_log(LOG_LOG, "adm-create");
+       yaz_log(LOG_LOG, "adm-create %s", r->toKeep->databaseName);
        zebra_admin_create (zh, r->toKeep->databaseName);
        break;
     case Z_ESAdminOriginPartToKeep_import: