X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fmaster-header;h=488093741e75cfbe9f8359e1901431935d0ecc83;hp=e8ad2a8573b87a61eb1ebe73dd8fbe0d9b950fe9;hb=63caccd96329d38750b23c1962bc6a37e7d3c7b5;hpb=64248c6114c42391aa85cf70958707b5acdc3482

diff --git a/zoom/master-header b/zoom/master-header
index e8ad2a8..4880937 100644
--- a/zoom/master-header
+++ b/zoom/master-header
@@ -1,10 +1,10 @@
-// $Id: master-header,v 1.11 2002-11-25 13:33:22 mike Exp $
+// $Id: master-header,v 1.17 2003-09-24 18:07:31 adam Exp $
 //
 // ZOOM C++ Binding.
 // The ZOOM homepage is at http://zoom.z3950.org/
 //
-// Derived from version 1.0g at
-//	http://zoom.z3950.org/bind/cplusplus/zoom-1.0g.hh
+// Derived from version 1.3a at
+//	http://zoom.z3950.org/bind/cplusplus/zoom-1.3a.hh
 
 #include <stddef.h>		// for size_t
 #include <string>
@@ -49,6 +49,7 @@ namespace ZOOM {
 * protected:
 *   ZOOM_query q;
   public:
+    query ();
     virtual ~query ();
   };
 
@@ -67,6 +68,10 @@ namespace ZOOM {
   class YAZ_EXPORT resultSet {
 *   connection &owner;
 *   ZOOM_resultset rs;
+*   friend class record; // for _getYazResultSet() & _getYazConnection()
+*   ZOOM_resultset _getYazResultSet () const { return rs; }
+*   ZOOM_connection _getYazConnection () const {
+*	return owner._getYazConnection(); }
     // resultSets are non-copyable.
     resultSet (const resultSet &);
     resultSet &operator= (const resultSet &);
@@ -79,18 +84,18 @@ namespace ZOOM {
   };
 
   class YAZ_EXPORT record {
-*   const resultSet *owner;
+*   const resultSet &owner;
 *   ZOOM_record r;
-*   friend class resultSet; // so it can use this constructor
-*   record::record (const resultSet *rs, ZOOM_record rec):
-*	owner (rs), r (rec) {}
   public:
-    class syntax {
+    class YAZ_EXPORT syntax {
     public:
       enum value {
 	UNKNOWN, GRS1, SUTRS, USMARC, UKMARC, XML
       };
-      syntax (value rs) : i(rs) {};
+*   private:
+*     enum value val;
+*   public:
+      syntax (value rs);
       operator std::string () const;
       bool operator== (const syntax &s) const;
       bool operator== (value rs) const;
@@ -124,24 +129,27 @@ namespace ZOOM {
   public:
     systemException ();		// Uses value of system `errno'
     systemException (int code);
+*   virtual std::string errmsg () const; // Why do I have to repeat this?
   };
 
   // bib1Exception::errcode() returns a code from the
   // Bib-1 Diagnostic Set.
   class YAZ_EXPORT bib1Exception: public exception {
-*   const char *info;
+*   std::string info;
   public:
 *   ~bib1Exception ();
     bib1Exception (int code, const std::string &addinfo);
+*   virtual std::string errmsg () const; // Why do I have to repeat this?
     std::string addinfo () const;
   };
 
   class YAZ_EXPORT queryException : public exception {
-*   const char *q;
+*   std::string q;
   public:
 *   ~queryException ();
     enum { PREFIX, CCL };
     queryException (int qtype, const std::string &source);
+*   virtual std::string errmsg () const; // Why do I have to repeat this?
     std::string addinfo () const;
   };
 }