Removed prefix Yaz_ from several class - and interface names now

[yazpp-moved-to-github.git] / include / yaz++ / z-server.h

diff --git a/include/yaz++/z-server.h b/include/yaz++/z-server.h
index 335da7e..bbb1db5 100644 (file)
--- a/include/yaz++/z-server.h
+++ b/include/yaz++/z-server.h
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2000-2001, Index Data.
+ * Copyright (c) 2000-2005, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: z-server.h,v 1.6 2005-06-02 06:40:21 adam Exp $
+ * $Id: z-server.h,v 1.7 2005-06-08 13:28:05 adam Exp $
  */
 
 #include <yaz++/z-assoc.h>
 
 namespace yazpp_1 {
 
-class Yaz_Z_Server;
+class Z_Server;
 
-class YAZ_EXPORT Yaz_Z_ServerUtility {
+class YAZ_EXPORT Z_ServerUtility {
  public:
     void create_databaseRecord (ODR odr, Z_NamePlusRecord *rec,
                                const char *dbname, int format,
@@ -23,32 +23,32 @@ class YAZ_EXPORT Yaz_Z_ServerUtility {
     Z_Records *create_nonSurrogateDiagnostics (ODR odr, int error,
                                               const char *addinfo);
 
-    void Yaz_Z_ServerUtility::create_diagnostics (
+    void Z_ServerUtility::create_diagnostics (
         ODR odr, int error, const char *addinfo,
         Z_DiagRec ***dreca, int *num);
 };
 
-class YAZ_EXPORT IYaz_Server_Facility {
+class YAZ_EXPORT IServer_Facility {
  public:
-    virtual int init(Yaz_Z_Server *server,
+    virtual int init(Z_Server *server,
                     Z_InitRequest *initRequest,
                     Z_InitResponse *initResponse) = 0;
-    virtual int recv(Yaz_Z_Server *server, Z_APDU *apdu) = 0;
+    virtual int recv(Z_Server *server, Z_APDU *apdu) = 0;
 };
 
-class YAZ_EXPORT Yaz_Facility_ILL : public IYaz_Server_Facility {
+class YAZ_EXPORT Yaz_Facility_ILL : public IServer_Facility {
  public:
     virtual void ill_service (Z_ExtendedServicesRequest *req,
                              Z_ItemOrder *io,
                              Z_ExtendedServicesResponse *res) = 0;
 
-    int init(Yaz_Z_Server *server,
+    int init(Z_Server *server,
             Z_InitRequest *initRequest,
             Z_InitResponse *initResponse);
-    int recv(Yaz_Z_Server *server, Z_APDU *apdu);
+    int recv(Z_Server *server, Z_APDU *apdu);
 };
 
-class YAZ_EXPORT Yaz_Facility_Update : public IYaz_Server_Facility {
+class YAZ_EXPORT Yaz_Facility_Update : public IServer_Facility {
  public:
     virtual void update_service (Z_ExtendedServicesRequest *req,
                                 Z_IUUpdate *io,
@@ -58,15 +58,15 @@ class YAZ_EXPORT Yaz_Facility_Update : public IYaz_Server_Facility {
                                 Z_IU0Update *io,
                                 Z_ExtendedServicesResponse *res) = 0;
 
-    int init(Yaz_Z_Server *server,
+    int init(Z_Server *server,
             Z_InitRequest *initRequest,
             Z_InitResponse *initResponse);
-    int recv(Yaz_Z_Server *server, Z_APDU *apdu);
+    int recv(Z_Server *server, Z_APDU *apdu);
 };
 
 
-class YAZ_EXPORT Yaz_Facility_Retrieval : public IYaz_Server_Facility,
-    public Yaz_Z_ServerUtility {
+class YAZ_EXPORT Yaz_Facility_Retrieval : public IServer_Facility,
+    public Z_ServerUtility {
  public:
 
     virtual int sr_init (Z_InitRequest *initRequest,
@@ -81,25 +81,25 @@ class YAZ_EXPORT Yaz_Facility_Retrieval : public IYaz_Server_Facility,
                                Z_RecordComposition *comp,
                                Z_NamePlusRecord *namePlusRecord,
                                Z_Records *diagnostics) = 0;
-    int init(Yaz_Z_Server *server,
+    int init(Z_Server *server,
             Z_InitRequest *initRequest,
             Z_InitResponse *initResponse);
-    int recv(Yaz_Z_Server *server, Z_APDU *apdu);
+    int recv(Z_Server *server, Z_APDU *apdu);
 
     ODR odr_encode();
     ODR odr_decode();
  private:
-    Z_Records *pack_records (Yaz_Z_Server *s,
+    Z_Records *pack_records (Z_Server *s,
                             const char *resultSetName,
                             int start, int num,
                             Z_RecordComposition *comp,
                             int *next, int *pres,
                             int *oid);
 
-    void fetch_via_piggyback (Yaz_Z_Server *s,
+    void fetch_via_piggyback (Z_Server *s,
                              Z_SearchRequest *searchRequest,
                              Z_SearchResponse *searchResponse);
-    void fetch_via_present (Yaz_Z_Server *s,
+    void fetch_via_present (Z_Server *s,
                            Z_PresentRequest *req, Z_PresentResponse *res);
 
     int m_preferredMessageSize;
@@ -108,27 +108,27 @@ class YAZ_EXPORT Yaz_Facility_Retrieval : public IYaz_Server_Facility,
     ODR m_odr_decode;
 };
 
-class YAZ_EXPORT Yaz_Z_Server_Facility_Info {
-    friend class Yaz_Z_Server;
-    IYaz_Server_Facility *m_facility;
+class YAZ_EXPORT Z_Server_Facility_Info {
+    friend class Z_Server;
+    IServer_Facility *m_facility;
     char *m_name;
-    Yaz_Z_Server_Facility_Info *m_next;
+    Z_Server_Facility_Info *m_next;
 };
 
 
 
-class YAZ_EXPORT Yaz_Z_Server : public Yaz_Z_Assoc {
+class YAZ_EXPORT Z_Server : public Z_Assoc {
 public:
-    Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable);
-    virtual ~Yaz_Z_Server();
+    Z_Server(IPDU_Observable *the_PDU_Observable);
+    virtual ~Z_Server();
     void recv_Z_PDU(Z_APDU *apdu, int len);
     virtual void recv_GDU(Z_GDU *apdu, int len);
-    void facility_add(IYaz_Server_Facility *facility, const char *name);
+    void facility_add(IServer_Facility *facility, const char *name);
     void facility_reset ();
 
 
  private:
-    Yaz_Z_Server_Facility_Info *m_facilities;
+    Z_Server_Facility_Info *m_facilities;
 };
 
 class YAZ_EXPORT Yaz_USMARC {