Modified Data1-system to use nmem

[yaz-moved-to-github.git] / asn / prt-rsc.c

diff --git a/asn/prt-rsc.c b/asn/prt-rsc.c
index c548d16..a7466f8 100644 (file)
--- a/asn/prt-rsc.c
+++ b/asn/prt-rsc.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-rsc.c,v $
- * Revision 1.1  1995-06-01 11:22:17  quinn
+ * 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
  *
  *
@@ -14,7 +26,7 @@
 
 /* -------------------- Resource 1 ------------------------- */
 
-int z_Estimate1(ODR o, Z_Estimate1, int opt)
+int z_Estimate1(ODR o, Z_Estimate1 **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
        return opt && odr_ok(o);
@@ -22,7 +34,7 @@ int z_Estimate1(ODR o, Z_Estimate1, int opt)
        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)
@@ -37,5 +49,31 @@ int z_ResourceReport1(ODR o, Z_ResourceReport1 **p, int opt)
        odr_sequence_end(o);
 }
 
-/* -------------------- Resource 1 ------------------------- */
+/* -------------------- 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)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+       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)
+{
+if (!odr_sequence_begin(o, p, sizeof(**p)))
+    return opt && odr_ok(o);
+return
+    odr_implicit_settag(o, ODR_CONTEXT, 1) &&
+    (odr_sequence_of(o, z_Estimate2, &(*p)->estimates,
+       &(*p)->num_estimates) || odr_ok(o)) &&
+    odr_implicit(o, odr_visiblestring, &(*p)->message, ODR_CONTEXT, 2, 1) &&
+    odr_sequence_end(o);
+}
+