X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=asn%2Fproto.c;h=5324a7094e478e3756cf91201e07f391ce597a27;hb=93e6cd96accab7cdef3a573479a5ec9c9fc47610;hp=6a682ed7e2f0db5b5988cf90db5c069f17bb1bda;hpb=2f1df9e6d0f93335cf2a6a487b0a06b43ff37b0c;p=yaz-moved-to-github.git

diff --git a/asn/proto.c b/asn/proto.c
index 6a682ed..5324a70 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -1,10 +1,28 @@
-/*
+    /*
  * Copyright (c) 1995, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.45  1996-02-23 10:00:25  quinn
+ * Revision 1.51  1996-07-26 14:07:21  quinn
+ * Small
+ *
+ * Revision 1.50  1996/07/26  13:36:15  quinn
+ * Various smallish
+ *
+ * Revision 1.49  1996/07/06  19:58:28  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.48  1996/06/10  08:53:33  quinn
+ * Added Summary,OPAC,ResourceReport
+ *
+ * Revision 1.47  1996/05/29  15:47:50  quinn
+ * Fixed in bug DiagRecs decoder. Thanks to Linda Harris.
+ *
+ * Revision 1.46  1996/04/10  11:39:42  quinn
+ * Fixed bug in UserInfo
+ *
+ * Revision 1.45  1996/02/23  10:00:25  quinn
  * Fixes to SCAN
  *
  * Revision 1.44  1996/02/20  12:51:41  quinn
@@ -218,7 +236,7 @@ int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
     	return opt && odr_ok(o);
     return
     	odr_implicit(o, z_InfoCategory, &(*p)->category, ODR_CONTEXT, 1, 1) &&
-	odr_choice(o, arm, &(*p)->which, &(*p)->information) &&
+	odr_choice(o, arm, &(*p)->information, &(*p)->which) &&
 	odr_sequence_end(o);
 }
     
@@ -265,7 +283,7 @@ int z_Unit(ODR o, Z_Unit **p, int opt)
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     	return opt && odr_ok(o);
     return
-    	odr_implicit(o, odr_visiblestring, &(*p)->unitSystem, ODR_CONTEXT,
+    	odr_explicit(o, z_InternationalString, &(*p)->unitSystem, ODR_CONTEXT,
 	    1, 1) &&
 	odr_explicit(o, z_StringOrNumeric, &(*p)->unitType, ODR_CONTEXT,
 	    2, 1) &&
@@ -870,7 +888,7 @@ int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt)
     	&(*p)->num_diagRecs))
     	return 1;
     *p = 0;
-    return 0;
+    return opt && odr_ok(o);
 }
 
 int z_NamePlusRecord(ODR o, Z_NamePlusRecord **p, int opt)
@@ -1727,6 +1745,35 @@ int z_SortRequest(ODR o, Z_SortRequest **p, int opt)
 	odr_sequence_end(o);
 }
 
+/* ---------------------- Resource Report ---------------- */
+
+int z_ResourceReportRequest(ODR o, Z_ResourceReportRequest **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+	return opt && odr_ok(o);
+    return
+        z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_implicit(o, z_ReferenceId, &(*p)->opId, ODR_CONTEXT, 210, 1) &&
+	odr_implicit(o, odr_oid, &(*p)->prefResourceReportFormat, ODR_CONTEXT,
+	    49, 1) &&
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+	odr_sequence_end(o);
+}
+
+int z_ResourceReportResponse(ODR o, Z_ResourceReportResponse **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+	return opt && odr_ok(o);
+    return
+        z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->resourceReportStatus,
+	    ODR_CONTEXT, 50, 0) &&
+	odr_explicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT,
+	    51, 1) &&
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+	odr_sequence_end(o);
+}
+
 /* ------------------------ APDU ------------------------- */
 
 int z_APDU(ODR o, Z_APDU **p, int opt)
@@ -1756,6 +1803,10 @@ int z_APDU(ODR o, Z_APDU **p, int opt)
 	    z_ResourceControlResponse},
     	{ODR_IMPLICIT, ODR_CONTEXT, 32, Z_APDU_triggerResourceControlRequest,
 	    z_TriggerResourceControlRequest},
+	{ODR_IMPLICIT, ODR_CONTEXT, 33, Z_APDU_resourceReportRequest,
+	    z_ResourceReportRequest},
+	{ODR_IMPLICIT, ODR_CONTEXT, 34, Z_APDU_resourceReportResponse,
+	    z_ResourceReportResponse},
 	{ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, z_ScanRequest},
 	{ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, z_ScanResponse},
 	{ODR_IMPLICIT, ODR_CONTEXT, 43, Z_APDU_sortRequest, z_SortRequest},
@@ -1772,6 +1823,7 @@ int z_APDU(ODR o, Z_APDU **p, int opt)
 
     if (o->direction == ODR_DECODE)
     	*p = odr_malloc(o, sizeof(**p));
+    odr_setlenlen(o, 5);
     if (!odr_choice(o, arm, &(*p)->u, &(*p)->which))
     {
     	if (o->direction == ODR_DECODE)