X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=asn%2Fprt-proto.h;h=2d5efb6a8182af432b0fff9d2316284bb3a16b88;hb=006c3df264a95c03bfc557b2004595fc6cc3ee14;hp=f83d1f3137bb910aa75971afe6dc6cf4a01fdf21;hpb=fa21652860bfd374c3fa9adee83ad726bffd6dbd;p=yaz-moved-to-github.git

diff --git a/asn/prt-proto.h b/asn/prt-proto.h
index f83d1f3..2d5efb6 100644
--- a/asn/prt-proto.h
+++ b/asn/prt-proto.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2000, Index Data.
+ * Copyright (c) 1995-2001, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: prt-proto.h,v 1.1 2000-10-03 12:55:50 adam Exp $
+ * $Id: prt-proto.h,v 1.3 2001-09-24 21:51:55 adam Exp $
  */
 
 #ifndef PRT_PROTO_H
@@ -322,9 +322,9 @@ typedef struct Z_Operator
 #define Z_Operator_prox 3
     union
     {
-    	Odr_null *and;          /* these guys are nulls. */
-    	Odr_null *or;
-    	Odr_null *and_not;
+    	Odr_null *op_and;          /* these guys are nulls. */
+    	Odr_null *op_or;
+    	Odr_null *op_and_not;
 	Z_ProximityOperator *prox;
     } u;
 } Z_Operator;
@@ -1145,6 +1145,12 @@ YAZ_EXPORT int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt,
 YAZ_EXPORT Z_APDU *zget_APDU(ODR o, int which);
 YAZ_EXPORT int z_Query(ODR o, Z_Query **p, int opt, const char *name);
 
+YAZ_EXPORT Odr_oid *yaz_oidval_to_z3950oid (ODR o, int oid_class,
+					int oid_value);
+YAZ_EXPORT Odr_oid *yaz_str_to_z3950oid (ODR o, int oid_class,
+					const char *str);
+YAZ_EXPORT const char *yaz_z3950oid_to_str (Odr_oid *oid, int *oid_class);
+
 YAZ_END_CDECL
 
 #include <yaz/prt-rsc.h>