Minor changes.

diff --git a/include/yaz++/yaz-z-server.h b/include/yaz++/yaz-z-server.h
index 969a8f6..cff9582 100644 (file)
--- a/include/yaz++/yaz-z-server.h
+++ b/include/yaz++/yaz-z-server.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2001, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-server.h,v 1.3 2001-03-27 14:47:45 adam Exp $
+ * $Id: yaz-z-server.h,v 1.4 2001-04-02 13:39:34 adam Exp $
  */
 
 #include <yaz++/yaz-z-assoc.h>
@@ -64,7 +64,13 @@ class YAZ_EXPORT Yaz_Facility_Retrieval : public IYaz_Server_Facility {
     void create_surrogateDiagnostics(Z_NamePlusRecord *rec,
                                     const char *dbname, int error,
                                     char *const addinfo);
+    
+    Z_Records *create_nonSurrogateDiagnostics (int error,
+                                              const char *addinfo);
+    
+
     virtual ODR odr_encode();
+
  private:
     Z_Records *pack_records (const char *resultSetName,
                             int start, int num,
@@ -72,9 +78,6 @@ class YAZ_EXPORT Yaz_Facility_Retrieval : public IYaz_Server_Facility {
                             int *next, int *pres,
                             int *oid);
 
-    Z_Records *create_nonSurrogateDiagnostics (int error,
-                                              const char *addinfo);
-    
     void fetch_via_piggyback (Z_SearchRequest *searchRequest,
                              Z_SearchResponse *searchResponse);
     void fetch_via_present (Z_PresentRequest *req, Z_PresentResponse *res);

diff --git a/win/yazclient/yazclient.dsp b/win/yazclient/yazclient.dsp
index ade1ecf..9265ec3 100644 (file)
--- a/win/yazclient/yazclient.dsp
+++ b/win/yazclient/yazclient.dsp
@@ -50,11 +50,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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:console /machine:I386
-# 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 yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /libpath:"../yazxx/release" /libpath:"../../../yaz/lib"
+# 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 yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /out:"Release/yazmyclient.exe" /libpath:"../yazxx/release" /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Release
 ProjDir=.
-TargetName=yazclient
+TargetName=yazmyclient
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # End Special Build Tool
@@ -81,11 +81,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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:console /debug /machine:I386 /pdbtype:sept
-# 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 yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/lib"
+# 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 yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/yazmyclient.exe" /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Debug
 ProjDir=.
-TargetName=yazclient
+TargetName=yazmyclient
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # End Special Build Tool
@@ -98,7 +98,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # Name "yazclient - Win32 Debug"
 # Begin Source File
 
-SOURCE="..\..\src\yaz-client.cpp"
+SOURCE="..\..\src\yaz-my-client.cpp"
 # End Source File
 # End Target
 # End Project

diff --git a/win/yazserver/yazserver.dsp b/win/yazserver/yazserver.dsp
index 7b78366..a22c350 100644 (file)
--- a/win/yazserver/yazserver.dsp
+++ b/win/yazserver/yazserver.dsp
@@ -50,11 +50,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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:console /machine:I386
-# 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 yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /libpath:"../yazxx/release" /libpath:"../../../yaz/lib"
+# 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 yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /out:"Release/yazmyserver.exe" /libpath:"../yazxx/release" /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Release
 ProjDir=.
-TargetName=yazserver
+TargetName=yazmyserver
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # End Special Build Tool
@@ -81,11 +81,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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:console /debug /machine:I386 /pdbtype:sept
-# 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 yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/lib"
+# 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 yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/yazmyserver.exe" /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Debug
 ProjDir=.
-TargetName=yazserver
+TargetName=yazmyserver
 SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # End Special Build Tool
@@ -98,7 +98,11 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # Name "yazserver - Win32 Debug"
 # Begin Source File
 
-SOURCE="..\..\src\yaz-server.cpp"
+SOURCE="..\..\src\yaz-marc-sample.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\yaz-my-server.cpp"
 # End Source File
 # End Target
 # End Project

diff --git a/win/yazxx/yazxx.dsp b/win/yazxx/yazxx.dsp
index 506beb4..0c7c76b 100644 (file)
--- a/win/yazxx/yazxx.dsp
+++ b/win/yazxx/yazxx.dsp
@@ -110,6 +110,10 @@ SOURCE="..\..\include\yaz++\yaz-ir-assoc.h"
 # End Source File
 # Begin Source File
 
+SOURCE="..\..\src\yaz-pdu-assoc-thread.cpp"
+# End Source File
+# Begin Source File
+
 SOURCE="..\..\src\yaz-pdu-assoc.cpp"
 # End Source File
 # Begin Source File
@@ -158,6 +162,14 @@ SOURCE="..\..\include\yaz++\yaz-z-query.h"
 # End Source File
 # Begin Source File
 
+SOURCE="..\..\src\yaz-z-server-ill.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\yaz-z-server-sr.cpp"
+# End Source File
+# Begin Source File
+
 SOURCE="..\..\src\yaz-z-server.cpp"
 # End Source File
 # Begin Source File