X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=b8965cd7d116bd787ca04fe74ff278bb541be1ac;hb=ef144bcc0523415f8ce2fd5d92db86043c2c1c7d;hp=ae04ebefa921b37627b0fea6459686d7a43ca5b4;hpb=54da2f13bc20e4369757453575668339c8dfd9fd;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index ae04ebe..b8965cd 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.69 2002-08-29 08:47:08 adam Exp $
+/* $Id: zebraapi.c,v 1.73 2002-09-17 12:27:12 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -863,8 +863,11 @@ int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
     return 1;
 }
 
-void zebra_admin_import_begin (ZebraHandle zh, const char *database)
+void zebra_admin_import_begin (ZebraHandle zh, const char *database,
+                               const char *record_type)
 {
+    if (zebra_select_database(zh, database))
+        return;
     zebra_begin_trans (zh);
     xfree (zh->admin_databaseName);
     zh->admin_databaseName = xstrdup(database);
@@ -911,10 +914,54 @@ void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
     }
 }
 
+int zebra_admin_exchange_record (ZebraHandle zh,
+                                 const char *database,
+                                 const char *rec_buf,
+                                 size_t rec_len,
+                                 const char *recid_buf, size_t recid_len,
+                                 int action)
+{
+    int sysno = 0;
+    char *rinfo = 0;
+    char recid_z[256];
+
+    if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
+        return -1;
+    memcpy (recid_z, recid_buf, recid_len);
+    recid_z[recid_len] = 0;
+
+    rinfo = dict_lookup (zh->reg->matchDict, recid_z);
+    if (rinfo)
+    {
+        if (action == 1)  /* fail if insert */
+            return -1;
+        memcpy (&sysno, rinfo+1, sizeof(sysno));
+    }
+    else
+    {
+        if (action == 2 || action == 3) /* fail if delete or update */
+            return -1;
+    }
+    extract_rec_in_mem (zh, "grs.sgml", rec_buf, rec_len, database,
+                        action == 3 ? 1 : 0 /* delete flag */,
+                        0, &sysno, 1, 1, 0);
+    if (action == 1)
+    {
+        dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
+    }
+    else if (action == 3)
+    {
+        dict_delete (zh->reg->matchDict, recid_z);
+    }
+    return 0;
+}
+
 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;
@@ -923,7 +970,7 @@ void zebra_admin_create (ZebraHandle zh, const char *database)
                                   /* explainDatabase */))
     {
 	zh->errCode = 224;
-	zh->errString = "Database already exist";
+	zh->errString = "database already exist";
     }
     zebra_end_trans (zh);
 }
@@ -959,7 +1006,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);
@@ -1211,10 +1258,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)