projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added include stdlib.h
[yazpp-moved-to-github.git]
/
zoom
/
master-header
diff --git
a/zoom/master-header
b/zoom/master-header
index
e8ad2a8
..
4880937
100644
(file)
--- 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/
//
//
// 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>
#include <stddef.h> // for size_t
#include <string>
@@
-49,6
+49,7
@@
namespace ZOOM {
* protected:
* ZOOM_query q;
public:
* protected:
* ZOOM_query q;
public:
+ query ();
virtual ~query ();
};
virtual ~query ();
};
@@
-67,6
+68,10
@@
namespace ZOOM {
class YAZ_EXPORT resultSet {
* connection &owner;
* ZOOM_resultset rs;
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 &);
// resultSets are non-copyable.
resultSet (const resultSet &);
resultSet &operator= (const resultSet &);
@@
-79,18
+84,18
@@
namespace ZOOM {
};
class YAZ_EXPORT record {
};
class YAZ_EXPORT record {
-* const resultSet *owner;
+* const resultSet &owner;
* ZOOM_record r;
* 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:
public:
- class syntax {
+ class YAZ_EXPORT syntax {
public:
enum value {
UNKNOWN, GRS1, SUTRS, USMARC, UKMARC, XML
};
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;
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);
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 {
};
// 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);
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 {
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);
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;
};
}
std::string addinfo () const;
};
}