X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkdump.c;h=3157512528238886e512fe42696d80a1e385be38;hb=189d7a12a2d0bac0bf87b53fa658c972fffc238c;hp=4f78ddda22c5083c2e38b69a220fec1ba780e8fe;hpb=85a2a0b28cb516d28ac70b7824f2b7d4b07e56ae;p=idzebra-moved-to-github.git

diff --git a/index/kdump.c b/index/kdump.c
index 4f78ddd..3157512 100644
--- a/index/kdump.c
+++ b/index/kdump.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kdump.c,v $
- * Revision 1.16  1998-05-20 10:12:17  adam
+ * Revision 1.21  2002-04-04 20:50:37  adam
+ * Multi register works with record paths and data1 profile path
+ *
+ * Revision 1.20  2002/04/04 14:14:13  adam
+ * Multiple registers (alpha early)
+ *
+ * Revision 1.19  2000/12/05 10:01:44  adam
+ * Fixed bug regarding user-defined attribute sets.
+ *
+ * Revision 1.18  1999/09/07 07:19:21  adam
+ * Work on character mapping. Implemented replace rules.
+ *
+ * Revision 1.17  1999/02/02 14:50:55  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.16  1998/05/20 10:12:17  adam
  * Implemented automatic EXPLAIN database maintenance.
  * Modified Zebra to work with ASN.1 compiled version of YAZ.
  *
@@ -63,7 +78,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -157,11 +172,11 @@ int main (int argc, char **argv)
         }
         else if (ret == 'v')
         {
-            log_init (log_mask_str(arg), prog, NULL);
+            yaz_log_init (yaz_log_mask_str(arg), prog, NULL);
         }
 	else if (ret == 'c')
 	{
-	    if (!(res = res_open (arg)))
+	    if (!(res = res_open (arg, 0)))
             {
 		logf(LOG_FATAL, "Failed to open resource file %s", arg);
 	        exit (1);
@@ -179,8 +194,8 @@ int main (int argc, char **argv)
         exit (1);
     }
     if (!res)
-        res = res_open ("zebra.cfg");
-    zm = zebra_maps_open (res);
+        res = res_open ("zebra.cfg", 0);
+    zm = zebra_maps_open (res, 0);
     if (!(inf = fopen (key_fname, "r")))
     {
         logf (LOG_FATAL|LOG_ERRNO, "fopen %s", key_fname);
@@ -204,8 +219,11 @@ int main (int argc, char **argv)
 	while (*from)
 	{
 	    const char *res = zebra_maps_output (zm, reg_type, &from);
-	    while (*res)
-		*(to++) = *(res++);
+	    if (!res)
+		*to++ = *from++;
+	    else
+		while (*res)
+		    *to++ = *res++;
 	}
 	*to = '\0';
         printf ("%c %3d %c %7d %5d %s\n", reg_type, usedb_type, op ? 'i':'d',