X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fprt-rsc.c;h=db690eed6ece856b5974d57b7209711a3e8b0d71;hp=c548d168dcc9207c408a170fd47e7fdbe591b324;hb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;hpb=4b449e2e477bc6feca0b83ce8e8e0bbc205c7e4a

diff --git a/asn/prt-rsc.c b/asn/prt-rsc.c
index c548d16..db690ee 100644
--- a/asn/prt-rsc.c
+++ b/asn/prt-rsc.c
@@ -1,41 +1,91 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-rsc.c,v $
- * Revision 1.1  1995-06-01 11:22:17  quinn
+ * Revision 1.8  1999-11-30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.7  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.6  1998/02/11 11:53:32  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.5  1995/09/29 17:11:55  quinn
+ * Smallish
+ *
+ * Revision 1.4  1995/09/27  15:02:43  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/06/02  09:49:15  quinn
+ * Adding access control
+ *
+ * Revision 1.2  1995/06/01  14:34:53  quinn
+ * Work
+ *
+ * Revision 1.1  1995/06/01  11:22:17  quinn
  * Resource control
  *
  *
  */
 
-#include <proto.h>
+#include <yaz/proto.h>
 
 /* -------------------- Resource 1 ------------------------- */
 
-int z_Estimate1(ODR o, Z_Estimate1, int opt)
+int z_Estimate1(ODR o, Z_Estimate1 **p, int opt, const char *name)
 {
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    if (!odr_sequence_begin(o, p, sizeof(**p), 0))
     	return opt && odr_ok(o);
     return
     	odr_implicit(o, odr_integer, &(*p)->type, ODR_CONTEXT, 1, 0) &&
 	odr_implicit(o, odr_integer, &(*p)->value, ODR_CONTEXT, 2, 0) &&
 	odr_implicit(o, odr_integer, &(*p)->currencyCode, ODR_CONTEXT, 3, 1) &&
-	odr_sequence-end(o);
+	odr_sequence_end(o);
 }
 
-int z_ResourceReport1(ODR o, Z_ResourceReport1 **p, int opt)
+int z_ResourceReport1(ODR o, Z_ResourceReport1 **p, int opt, const char *name)
 {
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    if (!odr_sequence_begin(o, p, sizeof(**p), 0))
     	return opt && odr_ok(o);
     return
     	odr_implicit_settag(o, ODR_CONTEXT, 1) &&
-	odr_sequence_of(o, z_Estimate1, &(*p)->estimates,
-	    &(*p)->num_estimates) &&
-	odr_implicit(o, odr_visiblestring, &(*p)->message, ODR_CONTEXT, 2, 0) &&
+	odr_sequence_of(o, (Odr_fun)z_Estimate1, &(*p)->estimates,
+			&(*p)->num_estimates, 0) &&
+	odr_implicit(o, odr_visiblestring, &(*p)->message,
+		     ODR_CONTEXT, 2, 0) &&
+	odr_sequence_end(o);
+}
+
+/* -------------------- Resource 2 ------------------------- */
+
+/* int z_StringOrNumeric(ODR, Z_StringOrNumeric **, int); */
+/* int z_IntUnit(ODR, Z_IntUnit **, int); */
+
+int z_Estimate2(ODR o, Z_Estimate2 **p, int opt, const char *name)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p), 0))
+    	return opt && odr_ok(o);
+    return
+    	odr_explicit(o, z_StringOrNumeric, &(*p)->type, ODR_CONTEXT, 1, 0) &&
+	odr_implicit(o, z_IntUnit, &(*p)->value, ODR_CONTEXT, 2, 0) &&
+	odr_sequence_end(o);
+}
+
+int z_ResourceReport2(ODR o, Z_ResourceReport2 **p, int opt, const char *name)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p), 0))
+	return opt && odr_ok(o);
+    return
+	odr_implicit_settag(o, ODR_CONTEXT, 1) &&
+	(odr_sequence_of(o, (Odr_fun)z_Estimate2, &(*p)->estimates,
+			 &(*p)->num_estimates, 0) || odr_ok(o)) &&
+	odr_implicit(o, odr_visiblestring, &(*p)->message,
+		     ODR_CONTEXT, 2, 1) &&
 	odr_sequence_end(o);
 }
 
-/* -------------------- Resource 1 ------------------------- */