New windows NT/95 port using MSV5.0.

diff --git a/CHANGELOG b/CHANGELOG
index cc05b45..4d6670d 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,16 @@ Possible compatibility problems with earlier versions marked with '*'.
 
 --- XXXXX
 
+New windows 95/NT port using MSV5.0.
+
+Moved test server to 'ztest' directory - generic server code still
+in 'server' directory.
+
+Made prefix query handling thread safe.
+
+Added new function modifier YAZ_EXPORT to 'export' public DLL
+functions when using windows (see include/yconfig.h).
+
 Added definitions to the OID database (util/oid.c) (RVDM).
 
 Added new BIB-1 diagnostic messages to the handler diagbib1_str.

diff --git a/Makefile b/Makefile
index c50e021..09d3083 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1995-1997, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.32 1997-02-24 10:37:26 adam Exp $
+# $Id: Makefile,v 1.33 1997-09-01 08:47:18 adam Exp $
 
 # Uncomment the lines below to enable mOSI communcation.
 #ODEFS=-DUSE_XTIMOSI
@@ -13,7 +13,7 @@ CDEFS=$(ODEFS)
 #CC=
 SHELL=/bin/sh
 MAKE=make
-SUBDIR=util odr asn $(RFC1006) ccl comstack retrieval client server makelib
+SUBDIR=util odr asn $(RFC1006) ccl comstack retrieval client server ztest makelib
 # Add external libraries to the ELIBS macro
 ELIBS=
 CONTROL=RANLIB="ranlib" ELIBS="$(ELIBS)"

diff --git a/yaz.dsp b/yaz.dsp
new file mode 100644 (file)
index 0000000..9ff8bec
--- /dev/null
+++ b/yaz.dsp
@@ -0,0 +1,584 @@
+# Microsoft Developer Studio Project File - Name="yaz" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 5.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
+\r
+CFG=yaz - Win32 Release\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "yaz.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "yaz.mak" CFG="yaz - Win32 Release"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "yaz - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "yaz - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+MTL=midl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir ".\Release"\r
+# PROP BASE Intermediate_Dir ".\Release"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir ".\Release"\r
+# PROP Intermediate_Dir ".\Release"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINDOWS=1 /FD /c\r
+# SUBTRACT CPP /YX\r
+# ADD BASE MTL /nologo /D "NDEBUG" /win32\r
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x406 /d "NDEBUG"\r
+# ADD RSC /l 0x406 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386\r
+# SUBTRACT LINK32 /map\r
+# Begin Special Build Tool\r
+OutDir=.\.\Release\r
+ProjDir=.\r
+TargetName=yaz\r
+SOURCE=$(InputPath)\r
+PostBuild_Desc=Copy Lib and Dll\r
+PostBuild_Cmds=copy $(OutDir)\$(TargetName).lib $(ProjDir)\lib copy\\r
+  $(OutDir)\$(TargetName).dll $(ProjDir)\lib\r
+# End Special Build Tool\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir ".\yaz___Wi"\r
+# PROP BASE Intermediate_Dir ".\yaz___Wi"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir ".\Debug"\r
+# PROP Intermediate_Dir ".\Debug"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINDOWS=1 /FR /FD /c\r
+# SUBTRACT CPP /YX\r
+# ADD BASE MTL /nologo /D "_DEBUG" /win32\r
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x406 /d "_DEBUG"\r
+# ADD RSC /l 0x406 /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386\r
+# SUBTRACT LINK32 /pdb:none /force\r
+# Begin Special Build Tool\r
+OutDir=.\.\Debug\r
+ProjDir=.\r
+TargetName=yaz\r
+SOURCE=$(InputPath)\r
+PostBuild_Desc=Copy Lib and Dll\r
+PostBuild_Cmds=copy $(OutDir)\$(TargetName).lib $(ProjDir)\lib copy\\r
+  $(OutDir)\$(TargetName).dll $(ProjDir)\lib\r
+# End Special Build Tool\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "yaz - Win32 Release"\r
+# Name "yaz - Win32 Debug"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\ber_any.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\ber_bit.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\ber_bool.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\ber_int.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\ber_len.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\ber_null.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\ber_oct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\ber_oid.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\ber_tag.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ccl\cclerrms.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ccl\cclfind.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ccl\cclptree.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ccl\cclqfile.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ccl\cclqual.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ccl\cclstr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ccl\ccltoken.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\comstack\comstack.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_absyn.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_attset.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_doespec.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_espec.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_expout.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_grs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_map.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_marc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_read.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_soif.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_sumout.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_sutrs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_tagset.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_varset.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\retrieval\d1_write.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asn\diagbib1.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\dmalloc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\dumpber.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\log.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\marcdisp.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\nmem.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_any.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_bit.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_bool.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_choice.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_cons.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_int.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_mem.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_null.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_oct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_oid.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_priv.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_seq.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_tag.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_use.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\odr\odr_util.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\oid.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\options.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\pquery.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asn\proto.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\asn\prt-acc.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\asn\prt-add.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\asn\prt-arc.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\asn\prt-dia.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\asn\prt-esp.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\asn\prt-exd.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\asn\prt-exp.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\asn\prt-ext.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\asn\prt-grs.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\asn\prt-rsc.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\query.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\readconf.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\comstack\tcpip.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\tpath.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\comstack\waislen.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\wrbuf.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\util\xmalloc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\util\yaz-ccl.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\util\yaz-util.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\asn\zget.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"\r
+# Begin Source File\r
+\r
+SOURCE=.\include\ccl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\comstack.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\d1_attset.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\d1_map.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\data1.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\diagbib1.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\dmalloc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\server\eventl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\log.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\marcdisp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\nmem.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\odr.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\odr_use.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\oid.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\options.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\pquery.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\proto.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\prt-acc.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\prt-add.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\prt-arc.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\prt-dia.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\prt-esp.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\prt-exd.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\prt-exp.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\prt-ext.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\prt-grs.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\prt-rsc.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\prt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\readconf.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\tcpip.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\tpath.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\wrbuf.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\xmalloc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\yaz-ccl.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\yaz-util.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=".\include\yaz-version.h"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\include\yconfig.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "Resource Files"\r
+\r
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"\r
+# End Group\r
+# End Target\r
+# End Project\r

diff --git a/yaz.dsw b/yaz.dsw
new file mode 100644 (file)
index 0000000..435cd45
--- /dev/null
+++ b/yaz.dsw
@@ -0,0 +1,65 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00\r
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
+\r
+###############################################################################\r
+\r
+Project: "client"=.\client\client.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "server"=.\server\server.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "yaz"=.\yaz.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "ztest"=.\ztest\ztest.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Global:\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<3>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r