X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=dict%2Fdictext.c;h=18b9afdd7bfbbb8f04c539f0eb0e82e917f2f808;hb=76f8077473d16bc4886ca603f56ebf2aa36e2b17;hp=06f13e3d4b76b72c843f7258604c5100ad4e91d4;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/dict/dictext.c b/dict/dictext.c
index 06f13e3..18b9afd 100644
--- a/dict/dictext.c
+++ b/dict/dictext.c
@@ -1,8 +1,5 @@
-/* $Id: dictext.c,v 1.9 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1995-2008 Index Data
 
 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
@@ -15,9 +12,9 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -28,7 +25,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #include <ctype.h>
 
-#include <zebrautl.h>
+#include <idzebra/util.h>
+#include <yaz/yaz-util.h>
 
 char *prog;
 
@@ -42,7 +40,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)
         {
@@ -50,7 +48,7 @@ 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);
             }
         }
@@ -68,7 +66,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);
         }
     }
@@ -77,7 +75,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);
         }
     }
@@ -107,3 +105,11 @@ int main (int argc, char **argv)
 
 
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+