X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fdictext.c;h=a04b057b1efb2d1e20e67cb9685ba4b8d38ede68;hp=09c41987dc553b6ac2c89893962cac74ad60514a;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858

diff --git a/dict/dictext.c b/dict/dictext.c
index 09c4198..a04b057 100644
--- a/dict/dictext.c
+++ b/dict/dictext.c
@@ -1,31 +1,26 @@
-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: dictext.c,v $
- * Revision 1.7  1999-02-02 14:50:18  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.6  1996/10/29 14:00:02  adam
- * Page size given by DICT_DEFAULT_PAGESIZE in dict.h.
- *
- * Revision 1.5  1996/01/31 21:03:59  adam
- * Extra options.
- *
- * Revision 1.4  1995/09/04  12:33:31  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.3  1994/10/04  17:46:54  adam
- * Function options now returns arg with error option.
- *
- * Revision 1.2  1994/09/28  13:07:08  adam
- * Use log_mask_str now.
- *
- * Revision 1.1  1994/09/16  15:39:11  adam
- * Initial code of lookup - not tested yet.
- *
- */
+/* $Id: dictext.c,v 1.14 2006-05-10 08:13:18 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #include <string.h>
 #include <stdlib.h>
@@ -33,7 +28,8 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include <zebrautl.h>
+#include <idzebra/util.h>
+#include <yaz/yaz-util.h>
 
 char *prog;
 
@@ -47,7 +43,7 @@ int main (int argc, char **argv)
     char ipf_buf[1024];
 
     prog = *argv;
-    while ((ret = options ("8vh", argv, argc, &arg)) != -2)
+    while ((ret = options("8vh", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -55,13 +51,13 @@ int main (int argc, char **argv)
                 inputfile = arg;
             else
             {
-                logf (LOG_FATAL, "too many files specified\n");
+                yaz_log (YLOG_FATAL, "too many files specified\n");
                 exit (1);
             }
         }
         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 == 'h')
         {
@@ -73,7 +69,7 @@ int main (int argc, char **argv)
             use8 = 1;
         else
         {
-            logf (LOG_FATAL, "Unknown option '-%s'", arg);
+            yaz_log (YLOG_FATAL, "Unknown option '-%s'", arg);
             exit (1);
         }
     }
@@ -82,7 +78,7 @@ int main (int argc, char **argv)
         ipf = fopen (inputfile, "r");
         if (!ipf)
         {
-            logf (LOG_FATAL|LOG_ERRNO, "cannot open '%s'", inputfile);
+            yaz_log (YLOG_FATAL|YLOG_ERRNO, "cannot open '%s'", inputfile);
             exit (1);
         }
     }
@@ -112,3 +108,11 @@ int main (int argc, char **argv)
 
 
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+