Added refernceId handling for other services.

diff --git a/ChangeLog b/ChangeLog
new file mode 100644 (file)
index 0000000..e1787fb
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,2 @@
+2001-04-25  Adam Dickmeiss
+    * Server sets referenceId in responses..

diff --git a/Makefile.am b/Makefile.am
index 9a38cc1..21b4dd0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = src include
 
 
 SUBDIRS = src include
 

-EXTRA_DIST= LICENSE README.txt yaz++-config.in
+EXTRA_DIST= LICENSE README.txt ChangeLog yaz++-config.in

 
 dist-hook:
        cp -R $(srcdir)/win $(distdir)
 
 dist-hook:
        cp -R $(srcdir)/win $(distdir)

diff --git a/README.txt b/README.txt
index e912279..e43628c 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 YAZ++ - A C++ library for YAZ
 
 YAZ++ - A C++ library for YAZ
 

-$Id: README.txt,v 1.8 2001-01-10 09:14:08 adam Exp $
+$Id: README.txt,v 1.9 2001-04-25 19:40:18 adam Exp $

  
 o Introduction
 
  
 o Introduction
 

@@ -14,19 +14,14 @@ o Overview
 
 YAZ++ builds a programmers' library libyaz++.lib and a few
 example applications:
 
 YAZ++ builds a programmers' library libyaz++.lib and a few
 example applications:

-  yaz-client++       basic client
-  yaz-server++       basic server
-  yaz-proxy          proxy server
-
-Description in HTML format of object model can be found in the sub
-directory doc. The top-page of the documentaion is index.html. The
-documentation was auto-generated from YAZ++ source using doc++.
+  yaz-my-client      basic client
+  yaz-my-server      basic server
+  yaz-proxy          not-so-basic proxy server

 
 Directory structure of the YAZ++ package.
 
   -- src (C++ source)
 
 Directory structure of the YAZ++ package.
 
   -- src (C++ source)

-  -- include (C++ headers) 
-  -- doc (documentation)
+  -- include/yaz++ (C++ headers) 

   -- win (Windows build files)
 
 o Installation, Unix
   -- win (Windows build files)
 
 o Installation, Unix

@@ -56,8 +51,8 @@ those compilers.
 
   Workspace yazxx.dsw includes the projects
     yazxx.dsp       -   builds yazxx.dll
 
   Workspace yazxx.dsw includes the projects
     yazxx.dsp       -   builds yazxx.dll

-    yazclient.dsp   -   builds yazclient.exe
-    yazserver.dsp   -   builds yazserver.exe
+    yazclient.dsp   -   builds yazmyclient.exe
+    yazserver.dsp   -   builds yazmyserver.exe

     yazproxy.dsp    -   builds yazproxy.exe
 
 o About the proxy..
     yazproxy.dsp    -   builds yazproxy.exe
 
 o About the proxy..

diff --git a/src/yaz-z-server-ill.cpp b/src/yaz-z-server-ill.cpp
index fbe05d9..dd0c277 100644 (file)
--- a/src/yaz-z-server-ill.cpp
+++ b/src/yaz-z-server-ill.cpp
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-server-ill.cpp,v $
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-server-ill.cpp,v $

- * Revision 1.4  2001-04-04 14:02:49  adam
+ * Revision 1.5  2001-04-25 19:40:18  adam
+ * Added refernceId handling for other services.
+ *
+ * Revision 1.4  2001/04/04 14:02:49  adam

  * URSULA / Z-ruth service.
  *
  * Revision 1.3  2001/04/03 14:37:19  adam
  * URSULA / Z-ruth service.
  *
  * Revision 1.3  2001/04/03 14:37:19  adam

@@ -45,6 +48,7 @@ int Yaz_Facility_ILL::recv(Yaz_Z_Server *s, Z_APDU *apdu_request)
     apdu_response = s->create_Z_PDU(Z_APDU_extendedServicesResponse);
     ill_service(req, req->taskSpecificParameters->u.itemOrder,
         apdu_response->u.extendedServicesResponse);
     apdu_response = s->create_Z_PDU(Z_APDU_extendedServicesResponse);
     ill_service(req, req->taskSpecificParameters->u.itemOrder,
         apdu_response->u.extendedServicesResponse);

+    s->transfer_referenceId(apdu_request, apdu_response);

     s->send_Z_PDU(apdu_response);
     return 1;
 }
     s->send_Z_PDU(apdu_response);
     return 1;
 }

diff --git a/src/yaz-z-server-ursula.cpp b/src/yaz-z-server-ursula.cpp
index 2d751f7..0bf2ca8 100644 (file)
--- a/src/yaz-z-server-ursula.cpp
+++ b/src/yaz-z-server-ursula.cpp
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-server-ursula.cpp,v $
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-server-ursula.cpp,v $

- * Revision 1.3  2001-04-11 12:33:42  heikki
+ * Revision 1.4  2001-04-25 19:40:18  adam
+ * Added refernceId handling for other services.
+ *
+ * Revision 1.3  2001/04/11 12:33:42  heikki

  * Working on ursula things
  *
  * Revision 1.2  2001/04/05 15:12:24  adam
  * Working on ursula things
  *
  * Revision 1.2  2001/04/05 15:12:24  adam

@@ -59,7 +62,8 @@ int Yaz_Facility_Ursula::recv(Yaz_Z_Server *s, Z_APDU *apdu_request)
     apdu_response = s->create_Z_PDU(Z_APDU_extendedServicesResponse);
     ursula_service(req, pdu, apdu_response->u.extendedServicesResponse, NULL);
       // FIXME: Initialize the response pdu...   ADAM!!!
     apdu_response = s->create_Z_PDU(Z_APDU_extendedServicesResponse);
     ursula_service(req, pdu, apdu_response->u.extendedServicesResponse, NULL);
       // FIXME: Initialize the response pdu...   ADAM!!!

+    s->transfer_referenceId(apdu_request, apdu_response);

     s->send_Z_PDU(apdu_response);
     return 1;
 }
     s->send_Z_PDU(apdu_response);
     return 1;
 }

-#endif
\ No newline at end of file
+#endif

diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp
index 0b8eddc..ae7e94a 100644 (file)
--- a/src/yaz-z-server.cpp
+++ b/src/yaz-z-server.cpp
@@ -3,7 +3,10 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-server.cpp,v $
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-server.cpp,v $

- * Revision 1.11  2001-04-12 15:12:10  heikki
+ * Revision 1.12  2001-04-25 19:40:18  adam
+ * Added refernceId handling for other services.
+ *
+ * Revision 1.11  2001/04/12 15:12:10  heikki

  * minor ursula stuff
  *
  * Revision 1.10  2001/04/04 14:02:49  adam
  * minor ursula stuff
  *
  * Revision 1.10  2001/04/04 14:02:49  adam

@@ -111,6 +114,7 @@ void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request)
            f->m_facility->init(this, req, resp);
            f = f->m_next;
        }
            f->m_facility->init(this, req, resp);
            f = f->m_next;
        }

+       transfer_referenceId(apdu_request, apdu_response);

        send_Z_PDU(apdu_response);
     }
     else
        send_Z_PDU(apdu_response);
     }
     else