From 3c5f6226f97612c0d6ac40591f600587c5ffa858 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 2 Feb 1999 14:49:59 +0000 Subject: [PATCH] Updated WIN32 code specific sections. Changed header. --- apitest/apitest.dsp | 4 ++-- bfile/bfile.c | 9 ++++++--- bfile/mfile.c | 9 ++++++--- dfa/agrep.c | 16 +++++++++++----- dfa/bset.c | 7 +++++-- dfa/dfa.c | 7 +++++-- dfa/dfap.h | 7 +++++-- dfa/grepper.c | 7 +++++-- dfa/imalloc.c | 7 +++++-- dfa/imalloc.h | 7 +++++-- dfa/lexer.c | 7 +++++-- dfa/lexer.h | 7 +++++-- dfa/readfile.c | 7 +++++-- dfa/set.c | 7 +++++-- dfa/states.c | 7 +++++-- dict/close.c | 7 +++++-- dict/dclose.c | 7 +++++-- dict/delete.c | 7 +++++-- dict/dictext.c | 7 +++++-- dict/dicttest.c | 7 +++++-- dict/dopen.c | 9 ++++++--- dict/drdwr.c | 9 ++++++--- dict/insert.c | 7 +++++-- dict/lookgrep.c | 7 +++++-- dict/lookup.c | 7 +++++-- dict/lookupec.c | 7 +++++-- dict/open.c | 7 +++++-- dict/scan.c | 7 +++++-- include/bfile.h | 7 +++++-- include/bset.h | 7 +++++-- include/dfa.h | 7 +++++-- include/dict.h | 7 +++++-- include/direntz.h | 9 ++++++--- include/isam.h | 7 +++++-- include/mfile.h | 7 +++++-- include/res.h | 7 +++++-- include/rsbool.h | 7 +++++-- include/rset.h | 7 +++++-- include/rsisam.h | 7 +++++-- include/rsisamc.h | 7 +++++-- include/rsm_or.h | 7 +++++-- include/rsnull.h | 7 +++++-- include/rstemp.h | 7 +++++-- include/set.h | 7 +++++-- include/str.h | 7 +++++-- include/zebramap.h | 7 +++++-- include/zebrautl.h | 7 +++++-- include/zebraver.h | 9 ++++++--- index/attribute.c | 7 +++++-- index/dir.c | 9 ++++++--- index/dirs.c | 7 +++++-- index/extract.c | 9 ++++++--- index/invstat.c | 7 +++++-- index/kcompare.c | 7 +++++-- index/kdump.c | 9 ++++++--- index/kinput.c | 9 ++++++--- index/lockidx.c | 13 ++++++++----- index/locksrv.c | 9 ++++++--- index/lockutil.c | 21 +++++++++++---------- index/main.c | 13 ++++++++----- index/rank1.c | 9 ++++++--- index/recindex.c | 7 +++++-- index/recindex.h | 7 +++++-- index/recindxp.h | 7 +++++-- index/recstat.c | 9 ++++++--- index/retrieve.c | 9 ++++++--- index/symtab.c | 7 +++++-- index/trav.c | 9 ++++++--- index/trunc.c | 7 +++++-- index/zebraapi.c | 11 +++++++---- index/zinfo.h | 7 +++++-- index/zrpn.c | 9 ++++++--- index/zserver.c | 13 ++++++++----- index/zsets.c | 9 ++++++--- isam/isam.c | 7 +++++-- isam/isutil.c | 7 +++++-- isam/isutil.h | 7 +++++-- isam/keyops.h | 7 +++++-- isam/memory.c | 7 +++++-- isam/memory.h | 7 +++++-- isam/physical.c | 7 +++++-- isam/physical.h | 7 +++++-- isam/rootblk.c | 7 +++++-- isam/rootblk.h | 7 +++++-- recctrl/grsread.h | 7 +++++-- recctrl/marcread.c | 7 +++++-- recctrl/recgrs.c | 9 ++++++--- recctrl/recgrs.h | 7 +++++-- recctrl/rectext.h | 7 +++++-- recctrl/sgmlread.c | 7 +++++-- rset/rsbool.c | 7 +++++-- rset/rset.c | 7 +++++-- rset/rsisam.c | 7 +++++-- rset/rsisamc.c | 7 +++++-- rset/rsnull.c | 7 +++++-- rset/rstemp.c | 9 ++++++--- util/dirent.c | 9 ++++++--- util/passwddb.c | 9 ++++++--- util/res-test.c | 7 +++++-- util/res.c | 11 +++++++---- zebra.dsp | 4 ++-- 101 files changed, 545 insertions(+), 247 deletions(-) diff --git a/apitest/apitest.dsp b/apitest/apitest.dsp index 5829d0a..a03b9a1 100755 --- a/apitest/apitest.dsp +++ b/apitest/apitest.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\yaz\include" /I "..\index" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\yaz\include" /I "..\index" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x406 /d "NDEBUG" # ADD RSC /l 0x406 /d "NDEBUG" BSC32=bscmake.exe @@ -71,7 +71,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\bin # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\yaz\include" /I "..\index" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\..\yaz\include" /I "..\index" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x406 /d "_DEBUG" # ADD RSC /l 0x406 /d "_DEBUG" BSC32=bscmake.exe diff --git a/bfile/bfile.c b/bfile/bfile.c index eb59b4a..6700679 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: bfile.c,v $ - * Revision 1.26 1998-02-17 10:32:52 adam + * Revision 1.27 1999-02-02 14:50:01 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.26 1998/02/17 10:32:52 adam * Fixed bug: binary files weren't opened with flag b on NT. * * Revision 1.25 1997/10/27 14:25:38 adam @@ -88,7 +91,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/bfile/mfile.c b/bfile/mfile.c index eccdba2..a9dc9f6 100644 --- a/bfile/mfile.c +++ b/bfile/mfile.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: mfile.c,v $ - * Revision 1.29 1998-05-27 14:28:34 adam + * Revision 1.30 1999-02-02 14:50:02 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.29 1998/05/27 14:28:34 adam * Fixed bug in mf_write. 'Cap off' byte written at wrong offset. * * Revision 1.28 1998/05/20 10:00:35 adam @@ -103,7 +106,7 @@ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/dfa/agrep.c b/dfa/agrep.c index 2214fb5..5614080 100644 --- a/dfa/agrep.c +++ b/dfa/agrep.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: agrep.c,v $ - * Revision 1.10 1997-09-09 13:37:57 adam + * Revision 1.11 1999-02-02 14:50:03 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.10 1997/09/09 13:37:57 adam * Partial port to WIN95/NT. * * Revision 1.9 1996/10/29 13:57:18 adam @@ -46,9 +49,12 @@ #include #include -#include -#ifdef WINDOWS -#include +#include + +#ifdef WIN32 + +#include + #else #include #endif diff --git a/dfa/bset.c b/dfa/bset.c index 016c0bd..2f326c9 100644 --- a/dfa/bset.c +++ b/dfa/bset.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: bset.c,v $ - * Revision 1.4 1996-10-29 13:57:20 adam + * Revision 1.5 1999-02-02 14:50:04 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1996/10/29 13:57:20 adam * Include of zebrautl.h instead of alexutil.h. * * Revision 1.3 1995/09/04 12:33:25 adam diff --git a/dfa/dfa.c b/dfa/dfa.c index d303a9b..73730c8 100644 --- a/dfa/dfa.c +++ b/dfa/dfa.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dfa.c,v $ - * Revision 1.24 1998-10-28 10:48:55 adam + * Revision 1.25 1999-02-02 14:50:05 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.24 1998/10/28 10:48:55 adam * Added type cast to prevent warning. * * Revision 1.23 1998/09/02 14:15:28 adam diff --git a/dfa/dfap.h b/dfa/dfap.h index bdfe55c..7e160c3 100644 --- a/dfa/dfap.h +++ b/dfa/dfap.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dfap.h,v $ - * Revision 1.7 1997-09-29 09:05:17 adam + * Revision 1.8 1999-02-02 14:50:06 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.7 1997/09/29 09:05:17 adam * Thread safe DFA module. We simply had to put a few static vars to * the DFA_parse structure. * diff --git a/dfa/grepper.c b/dfa/grepper.c index 1340247..d7a858e 100644 --- a/dfa/grepper.c +++ b/dfa/grepper.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: grepper.c,v $ - * Revision 1.7 1996-10-29 13:57:24 adam + * Revision 1.8 1999-02-02 14:50:07 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.7 1996/10/29 13:57:24 adam * Include of zebrautl.h instead of alexutil.h. * * Revision 1.6 1996/01/08 09:09:20 adam diff --git a/dfa/imalloc.c b/dfa/imalloc.c index 3076d26..d93ea3b 100644 --- a/dfa/imalloc.c +++ b/dfa/imalloc.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: imalloc.c,v $ - * Revision 1.7 1997-10-27 14:27:13 adam + * Revision 1.8 1999-02-02 14:50:08 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.7 1997/10/27 14:27:13 adam * Minor changes. * * Revision 1.6 1996/10/29 13:57:25 adam diff --git a/dfa/imalloc.h b/dfa/imalloc.h index 6acb0a9..45fcd61 100644 --- a/dfa/imalloc.h +++ b/dfa/imalloc.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: imalloc.h,v $ - * Revision 1.3 1997-10-27 14:27:13 adam + * Revision 1.4 1999-02-02 14:50:09 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.3 1997/10/27 14:27:13 adam * Minor changes. * * Revision 1.2 1996/05/14 11:33:41 adam diff --git a/dfa/lexer.c b/dfa/lexer.c index 2d0fc5e..ace18cc 100644 --- a/dfa/lexer.c +++ b/dfa/lexer.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1996, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: lexer.c,v $ - * Revision 1.10 1996-10-29 13:57:27 adam + * Revision 1.11 1999-02-02 14:50:10 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.10 1996/10/29 13:57:27 adam * Include of zebrautl.h instead of alexutil.h. * * Revision 1.9 1996/05/14 11:33:41 adam diff --git a/dfa/lexer.h b/dfa/lexer.h index 3c446e4..050e998 100644 --- a/dfa/lexer.h +++ b/dfa/lexer.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: lexer.h,v $ - * Revision 1.2 1995-01-24 16:00:22 adam + * Revision 1.3 1999-02-02 14:50:11 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.2 1995/01/24 16:00:22 adam * Added -ansi to CFLAGS. * Some changes to the dfa module. * diff --git a/dfa/readfile.c b/dfa/readfile.c index b36c6ab..cd40c92 100644 --- a/dfa/readfile.c +++ b/dfa/readfile.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: readfile.c,v $ - * Revision 1.7 1996-10-29 13:57:28 adam + * Revision 1.8 1999-02-02 14:50:12 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.7 1996/10/29 13:57:28 adam * Include of zebrautl.h instead of alexutil.h. * * Revision 1.6 1996/01/08 09:09:21 adam diff --git a/dfa/set.c b/dfa/set.c index 285fe55..4a593d1 100644 --- a/dfa/set.c +++ b/dfa/set.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: set.c,v $ - * Revision 1.5 1996-10-29 13:57:29 adam + * Revision 1.6 1999-02-02 14:50:13 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.5 1996/10/29 13:57:29 adam * Include of zebrautl.h instead of alexutil.h. * * Revision 1.4 1995/09/04 12:33:27 adam diff --git a/dfa/states.c b/dfa/states.c index 5af3cae..566036e 100644 --- a/dfa/states.c +++ b/dfa/states.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: states.c,v $ - * Revision 1.5 1996-10-29 13:57:31 adam + * Revision 1.6 1999-02-02 14:50:14 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.5 1996/10/29 13:57:31 adam * Include of zebrautl.h instead of alexutil.h. * * Revision 1.4 1995/09/04 12:33:28 adam diff --git a/dict/close.c b/dict/close.c index f4e30c0..eea8b1a 100644 --- a/dict/close.c +++ b/dict/close.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: close.c,v $ - * Revision 1.5 1994-09-01 17:49:36 adam + * Revision 1.6 1999-02-02 14:50:15 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.5 1994/09/01 17:49:36 adam * Removed stupid line. Work on insertion in dictionary. Not finished yet. * * Revision 1.4 1994/09/01 17:44:06 adam diff --git a/dict/dclose.c b/dict/dclose.c index eb2d1d2..e66b96a 100644 --- a/dict/dclose.c +++ b/dict/dclose.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dclose.c,v $ - * Revision 1.4 1997-09-09 13:38:01 adam + * Revision 1.5 1999-02-02 14:50:16 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1997/09/09 13:38:01 adam * Partial port to WIN95/NT. * * Revision 1.3 1994/09/01 17:49:36 adam diff --git a/dict/delete.c b/dict/delete.c index cb9d64d..599ccd4 100644 --- a/dict/delete.c +++ b/dict/delete.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: delete.c,v $ - * Revision 1.4 1996-02-02 13:43:50 adam + * Revision 1.5 1999-02-02 14:50:17 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1996/02/02 13:43:50 adam * The public functions simply use char instead of Dict_char to represent * search strings. Dict_char is used internally only. * diff --git a/dict/dictext.c b/dict/dictext.c index 76ac896..09c4198 100644 --- a/dict/dictext.c +++ b/dict/dictext.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dictext.c,v $ - * Revision 1.6 1996-10-29 14:00:02 adam + * 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 diff --git a/dict/dicttest.c b/dict/dicttest.c index 2b0e1ee..4199f30 100644 --- a/dict/dicttest.c +++ b/dict/dicttest.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dicttest.c,v $ - * Revision 1.21 1996-10-29 14:00:03 adam + * Revision 1.22 1999-02-02 14:50:19 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.21 1996/10/29 14:00:03 adam * Page size given by DICT_DEFAULT_PAGESIZE in dict.h. * * Revision 1.20 1996/03/20 09:35:16 adam diff --git a/dict/dopen.c b/dict/dopen.c index 1f1fda3..9883be3 100644 --- a/dict/dopen.c +++ b/dict/dopen.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dopen.c,v $ - * Revision 1.5 1997-09-17 12:19:07 adam + * Revision 1.6 1999-02-02 14:50:20 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.5 1997/09/17 12:19:07 adam * Zebra version corresponds to YAZ version 1.4. * Changed Zebra server so that it doesn't depend on global common_resource. * @@ -18,7 +21,7 @@ #include #include -#ifndef WINDOWS +#ifndef WIN32 #include #endif #include diff --git a/dict/drdwr.c b/dict/drdwr.c index 45015fb..a786304 100644 --- a/dict/drdwr.c +++ b/dict/drdwr.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: drdwr.c,v $ - * Revision 1.9 1997-09-09 13:38:01 adam + * Revision 1.10 1999-02-02 14:50:21 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.9 1997/09/09 13:38:01 adam * Partial port to WIN95/NT. * * Revision 1.8 1995/01/24 11:25:11 adam @@ -25,7 +28,7 @@ #include #include -#ifndef WINDOWS +#ifndef WIN32 #include #endif #include diff --git a/dict/insert.c b/dict/insert.c index db7fa69..af7775b 100644 --- a/dict/insert.c +++ b/dict/insert.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: insert.c,v $ - * Revision 1.18 1998-03-05 08:17:24 adam + * Revision 1.19 1999-02-02 14:50:22 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.18 1998/03/05 08:17:24 adam * Added a few comments - no code changed. * * Revision 1.17 1996/05/14 15:49:09 adam diff --git a/dict/lookgrep.c b/dict/lookgrep.c index 39d2b3f..d4e9873 100644 --- a/dict/lookgrep.c +++ b/dict/lookgrep.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: lookgrep.c,v $ - * Revision 1.21 1998-06-24 12:16:12 adam + * Revision 1.22 1999-02-02 14:50:23 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.21 1998/06/24 12:16:12 adam * Support for relations on text operands. Open range support in * DFA module (i.e. [-j], [g-]). * diff --git a/dict/lookup.c b/dict/lookup.c index c16ac03..b7dd51c 100644 --- a/dict/lookup.c +++ b/dict/lookup.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: lookup.c,v $ - * Revision 1.8 1998-03-05 08:17:24 adam + * Revision 1.9 1999-02-02 14:50:25 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.8 1998/03/05 08:17:24 adam * Added a few comments - no code changed. * * Revision 1.7 1996/02/02 13:43:51 adam diff --git a/dict/lookupec.c b/dict/lookupec.c index 686aa04..212dbc8 100644 --- a/dict/lookupec.c +++ b/dict/lookupec.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: lookupec.c,v $ - * Revision 1.6 1996-02-02 13:43:51 adam + * Revision 1.7 1999-02-02 14:50:26 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.6 1996/02/02 13:43:51 adam * The public functions simply use char instead of Dict_char to represent * search strings. Dict_char is used internally only. * diff --git a/dict/open.c b/dict/open.c index 02b73fe..ad42795 100644 --- a/dict/open.c +++ b/dict/open.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: open.c,v $ - * Revision 1.12 1997-09-17 12:19:07 adam + * Revision 1.13 1999-02-02 14:50:27 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.12 1997/09/17 12:19:07 adam * Zebra version corresponds to YAZ version 1.4. * Changed Zebra server so that it doesn't depend on global common_resource. * diff --git a/dict/scan.c b/dict/scan.c index 924263d..5eaa727 100644 --- a/dict/scan.c +++ b/dict/scan.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: scan.c,v $ - * Revision 1.11 1998-06-22 11:34:45 adam + * Revision 1.12 1999-02-02 14:50:28 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.11 1998/06/22 11:34:45 adam * Changed scan callback function so it doesn't stop further scanning. * * Revision 1.10 1998/03/06 16:58:04 adam diff --git a/include/bfile.h b/include/bfile.h index 69a3b5b..ec86cd9 100644 --- a/include/bfile.h +++ b/include/bfile.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: bfile.h,v $ - * Revision 1.15 1997-09-17 12:19:07 adam + * Revision 1.16 1999-02-02 14:50:29 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.15 1997/09/17 12:19:07 adam * Zebra version corresponds to YAZ version 1.4. * Changed Zebra server so that it doesn't depend on global common_resource. * diff --git a/include/bset.h b/include/bset.h index f61d4b5..8f5a89f 100644 --- a/include/bset.h +++ b/include/bset.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: bset.h,v $ - * Revision 1.2 1997-09-05 15:29:59 adam + * Revision 1.3 1999-02-02 14:50:30 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.2 1997/09/05 15:29:59 adam * Changed prototype for chr_map_input - added const. * Added support for C++, headers uses extern "C" for public definitions. * diff --git a/include/dfa.h b/include/dfa.h index 8a031d3..a0bb90f 100644 --- a/include/dfa.h +++ b/include/dfa.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dfa.h,v $ - * Revision 1.8 1997-09-18 08:59:18 adam + * Revision 1.9 1999-02-02 14:50:31 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.8 1997/09/18 08:59:18 adam * Extra generic handle for the character mapping routines. * * Revision 1.7 1997/09/05 15:29:59 adam diff --git a/include/dict.h b/include/dict.h index 2dca367..6e4daf5 100644 --- a/include/dict.h +++ b/include/dict.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dict.h,v $ - * Revision 1.26 1997-09-18 08:59:18 adam + * Revision 1.27 1999-02-02 14:50:32 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.26 1997/09/18 08:59:18 adam * Extra generic handle for the character mapping routines. * * Revision 1.25 1997/09/17 12:19:09 adam diff --git a/include/direntz.h b/include/direntz.h index 3883511..9af21e8 100644 --- a/include/direntz.h +++ b/include/direntz.h @@ -1,10 +1,13 @@ /* - * Copyright (c) 1997, Index Data. + * Copyright (c) 1997-1999, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: direntz.h,v $ - * Revision 1.2 1997-09-17 12:19:09 adam + * Revision 1.3 1999-02-02 14:50:33 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.2 1997/09/17 12:19:09 adam * Zebra version corresponds to YAZ version 1.4. * Changed Zebra server so that it doesn't depend on global common_resource. * @@ -15,7 +18,7 @@ */ -#ifdef WINDOWS +#ifdef WIN32 /* make own version of dirent */ #include struct dirent { diff --git a/include/isam.h b/include/isam.h index c667175..9ecc319 100644 --- a/include/isam.h +++ b/include/isam.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: isam.h,v $ - * Revision 1.13 1997-09-17 12:19:09 adam + * Revision 1.14 1999-02-02 14:50:34 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.13 1997/09/17 12:19:09 adam * Zebra version corresponds to YAZ version 1.4. * Changed Zebra server so that it doesn't depend on global common_resource. * diff --git a/include/mfile.h b/include/mfile.h index 5d01264..82cce3d 100644 --- a/include/mfile.h +++ b/include/mfile.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: mfile.h,v $ - * Revision 1.9 1997-09-18 08:59:19 adam + * Revision 1.10 1999-02-02 14:50:35 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.9 1997/09/18 08:59:19 adam * Extra generic handle for the character mapping routines. * * Revision 1.8 1997/09/17 12:19:10 adam diff --git a/include/res.h b/include/res.h index 8908222..1ebbc71 100644 --- a/include/res.h +++ b/include/res.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: res.h,v $ - * Revision 1.9 1997-11-18 10:04:03 adam + * Revision 1.10 1999-02-02 14:50:36 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.9 1997/11/18 10:04:03 adam * Function res_trav returns number of 'hits'. * * Revision 1.8 1997/09/17 12:19:10 adam diff --git a/include/rsbool.h b/include/rsbool.h index 165a3f3..fc806a3 100644 --- a/include/rsbool.h +++ b/include/rsbool.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsbool.h,v $ - * Revision 1.6 1998-03-05 08:37:44 adam + * Revision 1.7 1999-02-02 14:50:37 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.6 1998/03/05 08:37:44 adam * New result set model. * * Revision 1.5 1997/09/05 15:30:02 adam diff --git a/include/rset.h b/include/rset.h index cf36870..6baacf4 100644 --- a/include/rset.h +++ b/include/rset.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rset.h,v $ - * Revision 1.15 1998-03-05 08:37:44 adam + * Revision 1.16 1999-02-02 14:50:38 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.15 1998/03/05 08:37:44 adam * New result set model. * * Revision 1.14 1998/02/10 11:56:46 adam diff --git a/include/rsisam.h b/include/rsisam.h index 0148fde..956cb23 100644 --- a/include/rsisam.h +++ b/include/rsisam.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsisam.h,v $ - * Revision 1.4 1998-03-05 08:37:44 adam + * Revision 1.5 1999-02-02 14:50:39 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1998/03/05 08:37:44 adam * New result set model. * * Revision 1.3 1997/09/05 15:30:04 adam diff --git a/include/rsisamc.h b/include/rsisamc.h index 29e1c8a..ba15bc8 100644 --- a/include/rsisamc.h +++ b/include/rsisamc.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1996-1998, Index Data I/S + * Copyright (C) 1996-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsisamc.h,v $ - * Revision 1.3 1998-03-05 08:37:44 adam + * Revision 1.4 1999-02-02 14:50:40 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.3 1998/03/05 08:37:44 adam * New result set model. * * Revision 1.2 1997/09/05 15:30:04 adam diff --git a/include/rsm_or.h b/include/rsm_or.h index c934b8a..2722f4a 100644 --- a/include/rsm_or.h +++ b/include/rsm_or.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsm_or.h,v $ - * Revision 1.4 1998-03-05 08:37:44 adam + * Revision 1.5 1999-02-02 14:50:41 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1998/03/05 08:37:44 adam * New result set model. * * Revision 1.3 1997/09/05 15:30:04 adam diff --git a/include/rsnull.h b/include/rsnull.h index 204903e..14548fe 100644 --- a/include/rsnull.h +++ b/include/rsnull.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsnull.h,v $ - * Revision 1.3 1998-03-05 08:37:44 adam + * Revision 1.4 1999-02-02 14:50:42 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.3 1998/03/05 08:37:44 adam * New result set model. * * Revision 1.2 1997/09/05 15:30:05 adam diff --git a/include/rstemp.h b/include/rstemp.h index 5ac9e51..63c3b7e 100644 --- a/include/rstemp.h +++ b/include/rstemp.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rstemp.h,v $ - * Revision 1.5 1998-03-05 08:37:44 adam + * Revision 1.6 1999-02-02 14:50:43 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.5 1998/03/05 08:37:44 adam * New result set model. * * Revision 1.4 1997/09/17 12:19:11 adam diff --git a/include/set.h b/include/set.h index cee6618..270bc4a 100644 --- a/include/set.h +++ b/include/set.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: set.h,v $ - * Revision 1.2 1997-09-05 15:30:05 adam + * Revision 1.3 1999-02-02 14:50:44 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.2 1997/09/05 15:30:05 adam * Changed prototype for chr_map_input - added const. * Added support for C++, headers uses extern "C" for public definitions. * diff --git a/include/str.h b/include/str.h index b89bd52..360c7b9 100644 --- a/include/str.h +++ b/include/str.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: str.h,v $ - * Revision 1.3 1997-09-05 15:30:06 adam + * Revision 1.4 1999-02-02 14:50:45 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.3 1997/09/05 15:30:06 adam * Changed prototype for chr_map_input - added const. * Added support for C++, headers uses extern "C" for public definitions. * diff --git a/include/zebramap.h b/include/zebramap.h index 4aeb095..96304df 100644 --- a/include/zebramap.h +++ b/include/zebramap.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zebramap.h,v $ - * Revision 1.6 1998-06-23 15:33:33 adam + * Revision 1.7 1999-02-02 14:50:46 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.6 1998/06/23 15:33:33 adam * Added feature to specify sort criteria in query (type 7 specifies * sort flags). * diff --git a/include/zebrautl.h b/include/zebrautl.h index fd8aa20..fa1997f 100644 --- a/include/zebrautl.h +++ b/include/zebrautl.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1995-1997, Index Data I/S + * Copyright (C) 1995-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zebrautl.h,v $ - * Revision 1.4 1997-10-27 14:33:04 adam + * Revision 1.5 1999-02-02 14:50:47 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1997/10/27 14:33:04 adam * Moved towards generic character mapping depending on "structure" * field in abstract syntax file. Fixed a few memory leaks. Fixed * bug with negative integers when doing searches with relational diff --git a/include/zebraver.h b/include/zebraver.h index 3d69834..c7da788 100644 --- a/include/zebraver.h +++ b/include/zebraver.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zebraver.h,v $ - * Revision 1.12 1998-02-10 12:03:05 adam + * Revision 1.13 1999-02-02 14:50:48 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.12 1998/02/10 12:03:05 adam * Implemented Sort. * * Revision 1.11 1998/01/29 13:33:04 adam @@ -47,6 +50,6 @@ #endif #ifndef ZEBRADATE -#define ZEBRADATE "$Date: 1998-02-10 12:03:05 $" +#define ZEBRADATE "$Date: 1999-02-02 14:50:48 $" #endif diff --git a/index/attribute.c b/index/attribute.c index 2f7d894..bc60c86 100644 --- a/index/attribute.c +++ b/index/attribute.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: attribute.c,v $ - * Revision 1.9 1998-05-20 10:12:14 adam + * Revision 1.10 1999-02-02 14:50:49 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.9 1998/05/20 10:12:14 adam * Implemented automatic EXPLAIN database maintenance. * Modified Zebra to work with ASN.1 compiled version of YAZ. * diff --git a/index/dir.c b/index/dir.c index c4201c6..1eccbfb 100644 --- a/index/dir.c +++ b/index/dir.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dir.c,v $ - * Revision 1.19 1998-11-03 10:16:11 adam + * Revision 1.20 1999-02-02 14:50:50 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.19 1998/11/03 10:16:11 adam * Uses stat and not lstat so that file traversal follows symbolic links. * * Revision 1.18 1997/09/25 14:55:33 adam @@ -67,7 +70,7 @@ #include #include #include -#ifndef WINDOWS +#ifndef WIN32 #include #endif #include diff --git a/index/dirs.c b/index/dirs.c index 70b9f4d..17b64c1 100644 --- a/index/dirs.c +++ b/index/dirs.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dirs.c,v $ - * Revision 1.14 1998-01-12 15:04:07 adam + * Revision 1.15 1999-02-02 14:50:51 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.14 1998/01/12 15:04:07 adam * The test option (-s) only uses read-lock (and not write lock). * * Revision 1.13 1997/09/09 13:38:06 adam diff --git a/index/extract.c b/index/extract.c index c031719..ebd04ac 100644 --- a/index/extract.c +++ b/index/extract.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: extract.c,v $ - * Revision 1.89 1998-10-28 10:54:38 adam + * Revision 1.90 1999-02-02 14:50:52 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.89 1998/10/28 10:54:38 adam * SDRKit integration. * * Revision 1.88 1998/10/16 08:14:29 adam @@ -326,7 +329,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/index/invstat.c b/index/invstat.c index afd0147..b368277 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: invstat.c,v $ - * Revision 1.7 1998-03-13 15:30:50 adam + * Revision 1.8 1999-02-02 14:50:53 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.7 1998/03/13 15:30:50 adam * New functions isc_block_used and isc_block_size. Fixed 'leak' * in isc_alloc_block. * diff --git a/index/kcompare.c b/index/kcompare.c index 0f3e3b3..d6c405a 100644 --- a/index/kcompare.c +++ b/index/kcompare.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: kcompare.c,v $ - * Revision 1.25 1998-06-08 15:26:06 adam + * Revision 1.26 1999-02-02 14:50:54 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.25 1998/06/08 15:26:06 adam * Minor changes. * * Revision 1.24 1998/06/08 14:43:12 adam diff --git a/index/kdump.c b/index/kdump.c index 4f78ddd..ddedacd 100644 --- a/index/kdump.c +++ b/index/kdump.c @@ -1,10 +1,13 @@ /* - * 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.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 +66,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/index/kinput.c b/index/kinput.c index c982b3f..9053738 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: kinput.c,v $ - * Revision 1.30 1998-10-28 10:53:57 adam + * Revision 1.31 1999-02-02 14:50:56 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.30 1998/10/28 10:53:57 adam * Added type cast to prevent warning. * * Revision 1.29 1998/06/11 15:41:39 adam @@ -111,7 +114,7 @@ */ #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/index/lockidx.c b/index/lockidx.c index 730a2bf..cd2583f 100644 --- a/index/lockidx.c +++ b/index/lockidx.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: lockidx.c,v $ - * Revision 1.15 1998-02-17 10:31:33 adam + * Revision 1.16 1999-02-02 14:50:57 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.15 1998/02/17 10:31:33 adam * Fixed bug in zebraIndexUnlock. On NT, the lock files wasn't removed. * * Revision 1.14 1998/01/12 15:04:08 adam @@ -61,7 +64,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -116,7 +119,7 @@ int zebraIndexWait (int commitPhase) h = server_lock_org; if (zebra_lock_nb (h)) { -#ifndef WINDOWS +#ifndef WIN32 if (errno != EWOULDBLOCK) { logf (LOG_FATAL|LOG_ERRNO, "flock"); @@ -196,7 +199,7 @@ void zebraIndexLock (BFiles bfs, int commitNow, const char *rval) } if (zebra_lock_nb (server_lock_main) == -1) { -#ifdef WINDOWS +#ifdef WIN32 logf (LOG_LOG, "waiting for other index process"); zebra_lock (server_lock_main); zebra_unlock (server_lock_main); diff --git a/index/locksrv.c b/index/locksrv.c index 57f106e..7591349 100644 --- a/index/locksrv.c +++ b/index/locksrv.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: locksrv.c,v $ - * Revision 1.11 1998-03-05 08:45:12 adam + * Revision 1.12 1999-02-02 14:50:58 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.11 1998/03/05 08:45:12 adam * New result set model and modular ranking system. Moved towards * descent server API. System information stored as "SGML" records. * @@ -46,7 +49,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/index/lockutil.c b/index/lockutil.c index bebe318..431cb9c 100644 --- a/index/lockutil.c +++ b/index/lockutil.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: lockutil.c,v $ - * Revision 1.10 1997-09-29 09:08:36 adam + * Revision 1.11 1999-02-02 14:50:59 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.10 1997/09/29 09:08:36 adam * Revised locking system to be thread safe for the server. * * Revision 1.9 1997/09/25 14:54:43 adam @@ -46,7 +49,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #else @@ -65,7 +68,7 @@ ZebraLockHandle zebra_lock_create (const char *name, int excl_flag) ZebraLockHandle h = xmalloc (sizeof(*h)); h->excl_flag = excl_flag; h->fd = -1; -#ifdef WINDOWS +#ifdef WIN32 if (!h->excl_flag) h->fd = open (name, O_BINARY|O_RDONLY); if (h->fd == -1) @@ -103,9 +106,7 @@ void zebra_lock_prefix (Res res, char *path) strcat (path, "/"); } -#ifdef WINDOWS - -#else +#ifndef WIN32 static int unixLock (int fd, int type, int cmd) { struct flock area; @@ -118,7 +119,7 @@ static int unixLock (int fd, int type, int cmd) int zebra_lock (ZebraLockHandle h) { -#ifdef WINDOWS +#ifdef WIN32 return _locking (h->fd, _LK_LOCK, 1); #else return unixLock (h->fd, h->excl_flag ? F_WRLCK : F_RDLCK, F_SETLKW); @@ -127,7 +128,7 @@ int zebra_lock (ZebraLockHandle h) int zebra_lock_nb (ZebraLockHandle h) { -#ifdef WINDOWS +#ifdef WIN32 return _locking (h->fd, _LK_NBLCK, 1); #else return unixLock (h->fd, h->excl_flag ? F_WRLCK : F_RDLCK, F_SETLK); @@ -136,7 +137,7 @@ int zebra_lock_nb (ZebraLockHandle h) int zebra_unlock (ZebraLockHandle h) { -#ifdef WINDOWS +#ifdef WIN32 return _locking (h->fd, _LK_UNLCK, 1); #else return unixLock (h->fd, F_UNLCK, F_SETLKW); diff --git a/index/main.c b/index/main.c index 97ac380..25dcd26 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.60 1998-10-28 10:54:39 adam + * Revision 1.61 1999-02-02 14:51:00 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.60 1998/10/28 10:54:39 adam * SDRKit integration. * * Revision 1.59 1998/10/16 08:14:32 adam @@ -225,7 +228,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -362,7 +365,7 @@ int main (int argc, char **argv) zebraIndexWait (1); logf (LOG_LOG, "commit execute"); bf_commitExec (rGroupDef.bfs); -#ifndef WINDOWS +#ifndef WIN32 sync (); #endif zebraIndexLockMsg ("d"); @@ -473,7 +476,7 @@ int main (int argc, char **argv) { logf (LOG_LOG, "merging with index"); key_input (rGroup.bfs, nsections, 60); -#ifndef WINDOWS +#ifndef WIN32 sync (); #endif } diff --git a/index/rank1.c b/index/rank1.c index d43204c..17f8616 100644 --- a/index/rank1.c +++ b/index/rank1.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1998, Index Data I/S + * Copyright (C) 1998-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rank1.c,v $ - * Revision 1.3 1998-06-12 12:21:53 adam + * Revision 1.4 1999-02-02 14:51:01 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.3 1998/06/12 12:21:53 adam * Fixed memory-leak. * * Revision 1.2 1998/03/05 13:03:29 adam @@ -18,7 +21,7 @@ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/index/recindex.c b/index/recindex.c index 73ef633..2d50d86 100644 --- a/index/recindex.c +++ b/index/recindex.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recindex.c,v $ - * Revision 1.20 1998-01-12 15:04:08 adam + * Revision 1.21 1999-02-02 14:51:03 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.20 1998/01/12 15:04:08 adam * The test option (-s) only uses read-lock (and not write lock). * * Revision 1.19 1997/09/17 12:19:16 adam diff --git a/index/recindex.h b/index/recindex.h index 55658eb..5fada63 100644 --- a/index/recindex.h +++ b/index/recindex.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recindex.h,v $ - * Revision 1.13 1998-03-05 08:45:12 adam + * Revision 1.14 1999-02-02 14:51:04 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.13 1998/03/05 08:45:12 adam * New result set model and modular ranking system. Moved towards * descent server API. System information stored as "SGML" records. * diff --git a/index/recindxp.h b/index/recindxp.h index 8776726..d371eea 100644 --- a/index/recindxp.h +++ b/index/recindxp.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recindxp.h,v $ - * Revision 1.4 1998-03-05 08:45:12 adam + * Revision 1.5 1999-02-02 14:51:05 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1998/03/05 08:45:12 adam * New result set model and modular ranking system. Moved towards * descent server API. System information stored as "SGML" records. * diff --git a/index/recstat.c b/index/recstat.c index e639592..3015264 100644 --- a/index/recstat.c +++ b/index/recstat.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recstat.c,v $ - * Revision 1.6 1998-01-12 15:04:08 adam + * Revision 1.7 1999-02-02 14:51:06 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.6 1998/01/12 15:04:08 adam * The test option (-s) only uses read-lock (and not write lock). * * Revision 1.5 1997/09/17 12:19:17 adam @@ -32,7 +35,7 @@ #include #include #include -#ifndef WINDOWS +#ifndef WIN32 #include #endif #include "recindxp.h" diff --git a/index/retrieve.c b/index/retrieve.c index 3ab4d8a..7b423c3 100644 --- a/index/retrieve.c +++ b/index/retrieve.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1995-1998, Index Data + * Copyright (C) 1995-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: retrieve.c,v $ - * Revision 1.3 1998-10-28 10:54:40 adam + * Revision 1.4 1999-02-02 14:51:07 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.3 1998/10/28 10:54:40 adam * SDRKit integration. * * Revision 1.2 1998/10/16 08:14:33 adam @@ -20,7 +23,7 @@ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #else diff --git a/index/symtab.c b/index/symtab.c index 1ed1e57..d3d7e6a 100644 --- a/index/symtab.c +++ b/index/symtab.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: symtab.c,v $ - * Revision 1.4 1997-09-09 13:38:09 adam + * Revision 1.5 1999-02-02 14:51:08 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1997/09/09 13:38:09 adam * Partial port to WIN95/NT. * * Revision 1.3 1996/10/29 14:06:54 adam diff --git a/index/trav.c b/index/trav.c index 943b4f1..fec9d6a 100644 --- a/index/trav.c +++ b/index/trav.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: trav.c,v $ - * Revision 1.34 1998-06-08 14:43:14 adam + * Revision 1.35 1999-02-02 14:51:09 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.34 1998/06/08 14:43:14 adam * Added suport for EXPLAIN Proxy servers - added settings databasePath * and explainDatabase to facilitate this. Increased maximum number * of databases and attributes in one register. @@ -133,7 +136,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #define S_ISREG(x) (x & _S_IFREG) #define S_ISDIR(x) (x & _S_IFDIR) diff --git a/index/trunc.c b/index/trunc.c index dc7daeb..f9ecdc6 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: trunc.c,v $ - * Revision 1.11 1998-03-25 13:48:02 adam + * Revision 1.12 1999-02-02 14:51:10 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.11 1998/03/25 13:48:02 adam * Fixed bug in rset_trunc_r. * * Revision 1.10 1998/03/05 08:45:13 adam diff --git a/index/zebraapi.c b/index/zebraapi.c index eaf6987..fb7bc57 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1995-1998, Index Data + * Copyright (C) 1995-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zebraapi.c,v $ - * Revision 1.13 1998-12-16 12:23:30 adam + * Revision 1.14 1999-02-02 14:51:11 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.13 1998/12/16 12:23:30 adam * Added facility for database name mapping using resource mapdb. * * Revision 1.12 1998/11/16 10:18:10 adam @@ -53,7 +56,7 @@ */ #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #else @@ -161,7 +164,7 @@ static void zebra_register_unlock (ZebraHandle zh) else waitSec = 0; } -#ifdef WINDOWS +#ifdef WIN32 #else if (waitSec > 0) sleep (waitSec); diff --git a/index/zinfo.h b/index/zinfo.h index f0ede54..73e4baa 100644 --- a/index/zinfo.h +++ b/index/zinfo.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zinfo.h,v $ - * Revision 1.5 1998-06-08 14:43:16 adam + * Revision 1.6 1999-02-02 14:51:12 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.5 1998/06/08 14:43:16 adam * Added suport for EXPLAIN Proxy servers - added settings databasePath * and explainDatabase to facilitate this. Increased maximum number * of databases and attributes in one register. diff --git a/index/zrpn.c b/index/zrpn.c index 9dd7d2d..fdb31e9 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1995-1998, Index Data + * Copyright (C) 1995-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zrpn.c,v $ - * Revision 1.90 1998-11-16 16:03:43 adam + * Revision 1.91 1999-02-02 14:51:13 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.90 1998/11/16 16:03:43 adam * Moved loggin utilities to Yaz. Was implemented in file zlogs.c. * * Revision 1.89 1998/11/16 10:11:55 adam @@ -316,7 +319,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/index/zserver.c b/index/zserver.c index 9e4543c..85ff5d9 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1995-1998, Index Data + * Copyright (C) 1995-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.66 1998-10-28 10:54:41 adam + * Revision 1.67 1999-02-02 14:51:14 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.66 1998/10/28 10:54:41 adam * SDRKit integration. * * Revision 1.65 1998/10/18 07:54:54 adam @@ -243,7 +246,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #else @@ -421,7 +424,7 @@ int bend_sort (void *handle, bend_sort_rr *rr) return 0; } -#ifndef WINDOWS +#ifndef WIN32 static void pre_init (struct statserv_options_block *sob) { char *pidfile = "zebrasrv.pid"; @@ -446,7 +449,7 @@ int main (int argc, char **argv) sob = statserv_getcontrol (); strcpy (sob->configname, FNAME_CONFIG); -#ifndef WINDOWS +#ifndef WIN32 sob->pre_init = pre_init; #endif statserv_setcontrol (sob); diff --git a/index/zsets.c b/index/zsets.c index b46f057..5deef63 100644 --- a/index/zsets.c +++ b/index/zsets.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zsets.c,v $ - * Revision 1.21 1998-11-16 16:03:46 adam + * Revision 1.22 1999-02-02 14:51:15 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.21 1998/11/16 16:03:46 adam * Moved loggin utilities to Yaz. Was implemented in file zlogs.c. * * Revision 1.20 1998/11/16 10:10:53 adam @@ -82,7 +85,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/isam/isam.c b/isam/isam.c index 362932c..e2205b1 100644 --- a/isam/isam.c +++ b/isam/isam.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: isam.c,v $ - * Revision 1.24 1997-10-27 14:25:39 adam + * Revision 1.25 1999-02-02 14:51:16 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.24 1997/10/27 14:25:39 adam * Fixed memory leaks. * * Revision 1.23 1997/09/17 12:19:20 adam diff --git a/isam/isutil.c b/isam/isutil.c index 2612f38..4713a23 100644 --- a/isam/isutil.c +++ b/isam/isutil.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: isutil.c,v $ - * Revision 1.3 1996-10-29 13:56:55 adam + * Revision 1.4 1999-02-02 14:51:17 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.3 1996/10/29 13:56:55 adam * Include of zebrautl.h instead of alexutil.h. * * Revision 1.2 1995/09/04 12:33:46 adam diff --git a/isam/isutil.h b/isam/isutil.h index 50bbb62..4c173fd 100644 --- a/isam/isutil.h +++ b/isam/isutil.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: isutil.h,v $ - * Revision 1.1 1994-09-12 08:02:14 quinn + * Revision 1.2 1999-02-02 14:51:18 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.1 1994/09/12 08:02:14 quinn * Not functional yet * */ diff --git a/isam/keyops.h b/isam/keyops.h index 3b8476f..8da0176 100644 --- a/isam/keyops.h +++ b/isam/keyops.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: keyops.h,v $ - * Revision 1.1 1994-09-26 16:07:55 quinn + * Revision 1.2 1999-02-02 14:51:19 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.1 1994/09/26 16:07:55 quinn * Most of the functionality in place. * */ diff --git a/isam/memory.c b/isam/memory.c index 898465d..8079f22 100644 --- a/isam/memory.c +++ b/isam/memory.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: memory.c,v $ - * Revision 1.15 1997-09-09 13:38:11 adam + * Revision 1.16 1999-02-02 14:51:20 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.15 1997/09/09 13:38:11 adam * Partial port to WIN95/NT. * * Revision 1.14 1996/10/29 13:56:56 adam diff --git a/isam/memory.h b/isam/memory.h index 91ae95b..4a69110 100644 --- a/isam/memory.h +++ b/isam/memory.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: memory.h,v $ - * Revision 1.6 1997-09-05 15:30:10 adam + * Revision 1.7 1999-02-02 14:51:21 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.6 1997/09/05 15:30:10 adam * Changed prototype for chr_map_input - added const. * Added support for C++, headers uses extern "C" for public definitions. * diff --git a/isam/physical.c b/isam/physical.c index 9837e00..3664ecf 100644 --- a/isam/physical.c +++ b/isam/physical.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: physical.c,v $ - * Revision 1.14 1997-09-09 13:38:12 adam + * Revision 1.15 1999-02-02 14:51:22 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.14 1997/09/09 13:38:12 adam * Partial port to WIN95/NT. * * Revision 1.13 1996/10/29 13:56:57 adam diff --git a/isam/physical.h b/isam/physical.h index 56caf4d..7cd111f 100644 --- a/isam/physical.h +++ b/isam/physical.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: physical.h,v $ - * Revision 1.4 1997-09-05 15:30:10 adam + * Revision 1.5 1999-02-02 14:51:23 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1997/09/05 15:30:10 adam * Changed prototype for chr_map_input - added const. * Added support for C++, headers uses extern "C" for public definitions. * diff --git a/isam/rootblk.c b/isam/rootblk.c index 09aa672..43274af 100644 --- a/isam/rootblk.c +++ b/isam/rootblk.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rootblk.c,v $ - * Revision 1.2 1995-09-04 12:33:47 adam + * Revision 1.3 1999-02-02 14:51:24 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.2 1995/09/04 12:33:47 adam * Various cleanup. YAZ util used instead. * * Revision 1.1 1994/09/26 16:08:00 quinn diff --git a/isam/rootblk.h b/isam/rootblk.h index a7499cb..2ae6b0a 100644 --- a/isam/rootblk.h +++ b/isam/rootblk.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rootblk.h,v $ - * Revision 1.1 1994-09-26 16:08:00 quinn + * Revision 1.2 1999-02-02 14:51:25 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.1 1994/09/26 16:08:00 quinn * Most of the functionality in place. * */ diff --git a/recctrl/grsread.h b/recctrl/grsread.h index 1e522b9..00851ef 100644 --- a/recctrl/grsread.h +++ b/recctrl/grsread.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1996, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: grsread.h,v $ - * Revision 1.4 1997-09-17 12:19:21 adam + * Revision 1.5 1999-02-02 14:51:26 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1997/09/17 12:19:21 adam * Zebra version corresponds to YAZ version 1.4. * Changed Zebra server so that it doesn't depend on global common_resource. * diff --git a/recctrl/marcread.c b/recctrl/marcread.c index dac48d0..49d724d 100644 --- a/recctrl/marcread.c +++ b/recctrl/marcread.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1997, Index Data I/S + * Copyright (C) 1997-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: marcread.c,v $ - * Revision 1.5 1997-11-18 10:03:24 adam + * Revision 1.6 1999-02-02 14:51:27 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.5 1997/11/18 10:03:24 adam * Member num_children removed from data1_node. * * Revision 1.4 1997/10/27 14:34:26 adam diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index f1f4179..d2beb77 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recgrs.c,v $ - * Revision 1.23 1998-10-18 07:51:10 adam + * Revision 1.24 1999-02-02 14:51:28 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.23 1998/10/18 07:51:10 adam * Changed one logf call. * * Revision 1.22 1998/10/16 08:14:37 adam @@ -166,7 +169,7 @@ #include #include #include -#ifndef WINDOWS +#ifndef WIN32 #include #endif diff --git a/recctrl/recgrs.h b/recctrl/recgrs.h index f5494bc..d9a76c4 100644 --- a/recctrl/recgrs.h +++ b/recctrl/recgrs.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recgrs.h,v $ - * Revision 1.2 1997-04-30 08:56:08 quinn + * Revision 1.3 1999-02-02 14:51:29 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.2 1997/04/30 08:56:08 quinn * null * * Revision 1.1 1996/10/11 10:57:26 adam diff --git a/recctrl/rectext.h b/recctrl/rectext.h index 8bb3909..401fb68 100644 --- a/recctrl/rectext.h +++ b/recctrl/rectext.h @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1996, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rectext.h,v $ - * Revision 1.2 1997-04-30 08:56:08 quinn + * Revision 1.3 1999-02-02 14:51:30 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.2 1997/04/30 08:56:08 quinn * null * * Revision 1.1 1996/10/11 10:57:29 adam diff --git a/recctrl/sgmlread.c b/recctrl/sgmlread.c index 0e7513f..d80bc0c 100644 --- a/recctrl/sgmlread.c +++ b/recctrl/sgmlread.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1996, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: sgmlread.c,v $ - * Revision 1.4 1997-09-17 12:19:22 adam + * Revision 1.5 1999-02-02 14:51:31 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.4 1997/09/17 12:19:22 adam * Zebra version corresponds to YAZ version 1.4. * Changed Zebra server so that it doesn't depend on global common_resource. * diff --git a/rset/rsbool.c b/rset/rsbool.c index 5ebab94..4156a4c 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsbool.c,v $ - * Revision 1.14 1998-03-05 08:36:27 adam + * Revision 1.15 1999-02-02 14:51:32 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.14 1998/03/05 08:36:27 adam * New result set model. * * Revision 1.13 1997/12/18 10:54:24 adam diff --git a/rset/rset.c b/rset/rset.c index 392a585..5a3c4d2 100644 --- a/rset/rset.c +++ b/rset/rset.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rset.c,v $ - * Revision 1.12 1998-04-26 10:56:57 adam + * Revision 1.13 1999-02-02 14:51:33 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.12 1998/04/26 10:56:57 adam * Added include of string.h. * * Revision 1.11 1998/03/05 08:36:28 adam diff --git a/rset/rsisam.c b/rset/rsisam.c index 3cc42c1..baa2fc1 100644 --- a/rset/rsisam.c +++ b/rset/rsisam.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsisam.c,v $ - * Revision 1.18 1998-03-05 08:36:28 adam + * Revision 1.19 1999-02-02 14:51:34 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.18 1998/03/05 08:36:28 adam * New result set model. * * Revision 1.17 1997/12/18 10:54:25 adam diff --git a/rset/rsisamc.c b/rset/rsisamc.c index 7fad179..42b6c52 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsisamc.c,v $ - * Revision 1.5 1998-03-05 08:36:28 adam + * Revision 1.6 1999-02-02 14:51:35 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.5 1998/03/05 08:36:28 adam * New result set model. * * Revision 1.4 1997/12/18 10:54:25 adam diff --git a/rset/rsnull.c b/rset/rsnull.c index 578dc7c..a6d4959 100644 --- a/rset/rsnull.c +++ b/rset/rsnull.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsnull.c,v $ - * Revision 1.10 1998-03-05 08:36:28 adam + * Revision 1.11 1999-02-02 14:51:36 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.10 1998/03/05 08:36:28 adam * New result set model. * * Revision 1.9 1997/12/18 10:54:25 adam diff --git a/rset/rstemp.c b/rset/rstemp.c index 6110d2c..b487875 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rstemp.c,v $ - * Revision 1.24 1998-03-05 08:36:28 adam + * Revision 1.25 1999-02-02 14:51:37 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.24 1998/03/05 08:36:28 adam * New result set model. * * Revision 1.23 1997/12/18 10:54:25 adam @@ -91,7 +94,7 @@ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/util/dirent.c b/util/dirent.c index 908a450..2127fd4 100644 --- a/util/dirent.c +++ b/util/dirent.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1997, Index Data I/S + * Copyright (C) 1997-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: dirent.c,v $ - * Revision 1.2 1997-09-17 12:19:24 adam + * Revision 1.3 1999-02-02 14:51:38 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.2 1997/09/17 12:19:24 adam * Zebra version corresponds to YAZ version 1.4. * Changed Zebra server so that it doesn't depend on global common_resource. * @@ -13,7 +16,7 @@ * This utility implements a opendir/readdir/close on Windows. */ -#ifdef WINDOWS +#ifdef WIN32 #include #include #include diff --git a/util/passwddb.c b/util/passwddb.c index 4595f43..cbe1485 100644 --- a/util/passwddb.c +++ b/util/passwddb.c @@ -1,17 +1,20 @@ /* - * Copyright (C) 1998, Index Data ApS + * Copyright (C) 1998-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: passwddb.c,v $ - * Revision 1.3 1998-06-25 19:16:32 adam + * Revision 1.4 1999-02-02 14:51:39 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.3 1998/06/25 19:16:32 adam * Minor changes to Visual C++ project. * * Revision 1.2 1998/06/25 09:55:51 adam * Minor changes - fixex headers. * */ -#ifdef WINDOWS +#ifdef WIN32 #else #include #endif diff --git a/util/res-test.c b/util/res-test.c index 4d227b1..7ad63d8 100644 --- a/util/res-test.c +++ b/util/res-test.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: res-test.c,v $ - * Revision 1.6 1996-10-29 13:48:16 adam + * Revision 1.7 1999-02-02 14:51:41 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.6 1996/10/29 13:48:16 adam * Updated to use zebrautl.h instead of alexutil.h. * * Revision 1.5 1995/09/04 12:34:05 adam diff --git a/util/res.c b/util/res.c index 202d351..d4522db 100644 --- a/util/res.c +++ b/util/res.c @@ -1,10 +1,13 @@ /* - * Copyright (C) 1994-1998, Index Data ApS + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: res.c,v $ - * Revision 1.23 1998-10-28 15:18:55 adam + * Revision 1.24 1999-02-02 14:51:42 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.23 1998/10/28 15:18:55 adam * Fix for DOS-formatted configuration files. * * Revision 1.22 1998/01/12 15:04:32 adam @@ -79,7 +82,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -215,7 +218,7 @@ static void reread (Res r) Res res_open (const char *name) { Res r; -#ifdef WINDOWS +#ifdef WIN32 if (access (name, 4)) #else if (access (name, R_OK)) diff --git a/zebra.dsp b/zebra.dsp index 526c637..db93c77 100644 --- a/zebra.dsp +++ b/zebra.dsp @@ -39,7 +39,7 @@ CPP=cl.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "..\yaz\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "..\yaz\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "include" /I "..\yaz\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WINDOWS" /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "include" /I "..\yaz\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -- 1.7.10.4