/*
- * Copyright (c) 1998-1999, Index Data
+ * Copyright (c) 1998-2000, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: z-proto.h,v $
- * Revision 1.1 1999-11-30 13:47:11 adam
+ * Revision 1.7 2001-09-24 21:51:55 adam
+ * New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid
+ * and yaz_z3950oid_to_str.
+ *
+ * Revision 1.6 2001/09/19 10:19:07 adam
+ * Z_SortCase_caseInsensitive was set to wrong value.
+ *
+ * Revision 1.5 2001/05/17 14:16:15 adam
+ * Added EXTERNAL handling for item update0 (1.0).
+ *
+ * Revision 1.4 2000/03/14 09:19:49 ian
+ * Added admin extended service encoders & decoders.
+ *
+ * Revision 1.3 2000/02/28 11:20:06 adam
+ * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.
+ *
+ * Revision 1.2 1999/12/16 23:36:19 adam
+ * Implemented ILL protocol. Minor updates ASN.1 compiler.
+ *
+ * Revision 1.1 1999/11/30 13:47:11 adam
* Improved installation. Moved header files to include/yaz.
*
* Revision 1.2 1999/06/09 10:52:11 adam
#define ASN_COMPILED 1
#include <yaz/yaz-version.h>
-#include <yaz/z-accdes1-p.h>
-#include <yaz/z-accform1-p.h>
-#include <yaz/z-acckrb1-p.h>
-#include <yaz/z-core-p.h>
-#include <yaz/z-diag1-p.h>
-#include <yaz/z-espec1-p.h>
-#include <yaz/z-estask-p.h>
-#include <yaz/z-exp-p.h>
-#include <yaz/z-grs-p.h>
-#include <yaz/z-opac-p.h>
-#include <yaz/z-rrf1-p.h>
-#include <yaz/z-rrf2-p.h>
-#include <yaz/z-sum-p.h>
-#include <yaz/z-sutrs-p.h>
-#include <yaz/z-uifr1-p.h>
-#include <yaz/zes-expi-p.h>
-#include <yaz/zes-exps-p.h>
-#include <yaz/zes-order-p.h>
-#include <yaz/zes-pquery-p.h>
-#include <yaz/zes-psched-p.h>
-#include <yaz/zes-pset-p.h>
-#include <yaz/zes-update-p.h>
-#include <yaz/z-date-p.h>
-#include <yaz/z-univ-p.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <yaz/z-accdes1.h>
+#include <yaz/z-accform1.h>
+#include <yaz/z-acckrb1.h>
+#include <yaz/z-core.h>
+#include <yaz/z-diag1.h>
+#include <yaz/z-espec1.h>
+#include <yaz/z-estask.h>
+#include <yaz/z-exp.h>
+#include <yaz/z-grs.h>
+#include <yaz/z-opac.h>
+#include <yaz/z-rrf1.h>
+#include <yaz/z-rrf2.h>
+#include <yaz/z-sum.h>
+#include <yaz/z-sutrs.h>
+#include <yaz/z-uifr1.h>
+#include <yaz/zes-expi.h>
+#include <yaz/zes-exps.h>
+#include <yaz/zes-order.h>
+#include <yaz/zes-pquery.h>
+#include <yaz/zes-psched.h>
+#include <yaz/zes-pset.h>
+#include <yaz/zes-update.h>
+#include <yaz/zes-admin.h>
+#include <yaz/z-date.h>
+#include <yaz/z-univ.h>
+#include <yaz/zes-update0.h>
+
+YAZ_BEGIN_CDECL
#define Z_PRES_SUCCESS Z_PresentStatus_success
#define Z_PRES_PARTIAL_1 Z_PresentStatus_partial_1
#define Z_SortRelation_descendingByFreq Z_SortKeySpec_descendingByfrequency
#define Z_SortCase_caseSensitive Z_SortKeySpec_caseSensitive
-#define Z_SortCase_caseInsensitive Z_SortKeySpec_descendingByfrequency
+#define Z_SortCase_caseInsensitive Z_SortKeySpec_caseInsensitive
#define Z_TriggerResourceCtrl_resourceReport Z_TriggerResourceControlRequest_resourceReport
#define Z_TriggerResourceCtrl_resourceControl Z_TriggerResourceControlRequest_resourceControl
YAZ_EXPORT Z_APDU *zget_APDU(ODR o, int which);
YAZ_EXPORT Z_Close *zget_Close (ODR o);
+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);
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
#include <yaz/prt-ext.h>