Keep old defines for now. Reverts last commit

[yaz-moved-to-github.git] / include / yaz / proto.h

diff --git a/include/yaz/proto.h b/include/yaz/proto.h
index f1bf623..c35dbe4 100644 (file)
--- a/include/yaz/proto.h
+++ b/include/yaz/proto.h
@@ -1,9 +1,8 @@
 /*
- * Copyright (c) 1998-2003, Index Data
+ * Copyright (c) 1998-2004, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: proto.h,v 1.7 2003-02-12 15:06:43 adam Exp $
+ * $Id: proto.h,v 1.15 2004-05-10 07:52:07 adam Exp $
  */
 #ifndef Z_PROTO_H
 #define Z_PROTO_H
@@ -42,9 +41,12 @@
 #include <yaz/z-mterm2.h>
 #include <yaz/oid.h>
 #include <yaz/wrbuf.h>
+#include <yaz/zgdu.h>
+#include <yaz/z-oclcui.h>
 
 YAZ_BEGIN_CDECL
 
+#if 1
 #define Z_PRES_SUCCESS   Z_PresentStatus_success
 #define Z_PRES_PARTIAL_1 Z_PresentStatus_partial_1
 #define Z_PRES_PARTIAL_2 Z_PresentStatus_partial_2
@@ -94,6 +96,7 @@ YAZ_BEGIN_CDECL
 #define Z_SortResultSetStatus_interim     Z_SortResponse_interim
 #define Z_SortResultSetStatus_unchanged   Z_SortResponse_unchanged
 #define Z_SortResultSetStatus_none        Z_SortResponse_none
+#endif
 
 typedef Z_External Z_DatabaseRecord;
 typedef struct Z_IOItemOrder Z_ItemOrder;
@@ -110,51 +113,14 @@ YAZ_EXPORT const char* yaz_z3950_oid_value_to_str(oid_value ov, oid_class oc);
 
 YAZ_EXPORT void yaz_display_grs1(WRBUF wrbuf, Z_GenericRecord *r, int flags);
 
-typedef struct Z_HTTP_Header Z_HTTP_Header;
-
-struct Z_HTTP_Header {
-    char *name;
-    char *value;
-    Z_HTTP_Header *next;
-};
-
-typedef struct {
-    char *method;
-    char *version;
-    char *path;
-    Z_HTTP_Header *headers;
-    char *content_buf;
-    int content_len;
-} Z_HTTP_Request;
-
-typedef struct {
-    int code;
-    char *version;
-    Z_HTTP_Header *headers;
-    char *content_buf;
-    int content_len;
-} Z_HTTP_Response;
-
-#define Z_GDU_Z3950         1
-#define Z_GDU_HTTP_Request  2
-#define Z_GDU_HTTP_Response 3
-typedef struct {
-    int which;
-    union {
-        Z_APDU *z3950;
-        Z_HTTP_Request *HTTP_Request;
-        Z_HTTP_Response *HTTP_Response;
-    } u;
-} Z_GDU ;
-YAZ_EXPORT int z_GDU (ODR o, Z_GDU **p, int opt, const char *name);
-YAZ_EXPORT void z_HTTP_header_add(ODR o, Z_HTTP_Header **hp, const char *n,
-                                  const char *v);
-YAZ_EXPORT const char *z_HTTP_header_lookup(Z_HTTP_Header *hp, const char *n);
-
-YAZ_EXPORT const char *z_HTTP_errmsg(int code);
-
-YAZ_EXPORT Z_GDU *z_get_HTTP_Response(ODR o, int code);
+YAZ_EXPORT void yaz_display_OPAC(WRBUF wrbuf, Z_OPACRecord *r, int flags);
 
+YAZ_EXPORT int yaz_init_opt_encode(Z_Options *opt, const char *opt_str,
+                                  int *error_pos);
+YAZ_EXPORT void yaz_init_opt_decode(Z_Options *opt,
+                                   void (*pr)(const char *name,
+                                              void *clientData),
+                                   void *clientData);
 YAZ_END_CDECL
 
 #include <yaz/prt-ext.h>