Fixed in bug DiagRecs decoder. Thanks to Linda Harris.

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

diff --git a/asn/proto.c b/asn/proto.c
index edaf95b..6d61a12 100644 (file)
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.42  1996-01-22 09:46:31  quinn
+ * 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
+ * Completed SCAN. Fixed problems with EXTERNAL.
+ *
+ * Revision 1.43  1996/02/10  12:22:49  quinn
+ * Work on SCAN
+ *
+ * Revision 1.42  1996/01/22  09:46:31  quinn
  * Added Sort PDU. Moved StringList to main protocol file.
  *
  * Revision 1.41  1996/01/10  15:21:24  quinn
@@ -209,7 +224,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);
 }
     
@@ -861,7 +876,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)
@@ -1035,6 +1050,77 @@ int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt)
     return opt && !o->error;
 }
 
+#if 1
+
+int z_ByDatabase(ODR o, Z_ByDatabase **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    return
+        z_DatabaseName(o, &(*p)->db, 1) &&
+       odr_implicit(o, odr_integer, &(*p)->num, ODR_CONTEXT, 1, 1) &&
+       z_OtherInformation(o, &(*p)->otherDbInfo, 1) &&
+       odr_sequence_end(o);
+}
+
+int z_ByDatabaseList(ODR o, Z_ByDatabaseList **p, int opt)
+{
+    if (!odr_initmember(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    if (odr_sequence_of(o, z_ByDatabase, &(*p)->elements, &(*p)->num_elements))
+       return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_ScanOccurrences(ODR o, Z_ScanOccurrences **p, int opt)
+{
+    Odr_arm arm[] =
+    {
+       {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_ScanOccurrences_global, odr_integer},
+       {ODR_EXPLICIT, ODR_CONTEXT, 3, Z_ScanOccurrences_byDatabase,
+           z_ByDatabaseList},
+       {-1, -1, -1, -1, 0}
+    };
+
+    if (!odr_initmember(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+       return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_OccurrenceByAttributesElem(ODR o, Z_OccurrenceByAttributesElem **p,
+    int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    return
+        odr_explicit(o, z_AttributeList, &(*p)->attributes, ODR_CONTEXT,
+           1, 1) &&
+       z_ScanOccurrences(o, &(*p)->occurrences, 1) &&
+       z_OtherInformation(o, &(*p)->otherOccurInfo, 1) &&
+       odr_sequence_end(o);
+}
+
+int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
+{
+    if (!odr_initmember(o, p, sizeof(**p)))
+       return opt && odr_ok(o);
+    if (!odr_sequence_of(o, z_OccurrenceByAttributesElem, &(*p)->elements,
+       &(*p)->num_elements))
+       return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+#else
+
+/*
+ * Incomplete definition of occurencebyattributes.
+ */
+
 int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
@@ -1045,6 +1131,8 @@ int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
        odr_sequence_end(o);
 }
 
+#endif
+
 int z_TermInfo(ODR o, Z_TermInfo **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
@@ -1053,6 +1141,8 @@ int z_TermInfo(ODR o, Z_TermInfo **p, int opt)
        (willow_scan ? 
            odr_implicit(o, z_Term, &(*p)->term, ODR_CONTEXT, 1, 0) :
            z_Term(o, &(*p)->term, 0)) &&
+       odr_implicit(o, z_InternationalString, &(*p)->displayTerm, ODR_CONTEXT,
+           0, 1) &&
        z_AttributeList(o, &(*p)->suggestedAttributes, 1) &&
        odr_implicit(o, z_AlternativeTerm, &(*p)->alternativeTerm,
            ODR_CONTEXT, 4, 1) &&
@@ -1060,6 +1150,7 @@ int z_TermInfo(ODR o, Z_TermInfo **p, int opt)
            2, 1) &&
        odr_implicit(o, z_OccurrenceByAttributes, &(*p)->byAttributes,
            ODR_CONTEXT, 3, 1) &&
+       z_OtherInformation(o, &(*p)->otherTermInfo, 1) &&
        odr_sequence_end(o);
 }
 
@@ -1154,6 +1245,7 @@ int z_ScanResponse(ODR o, Z_ScanResponse **p, int opt)
        odr_implicit(o, odr_integer, &(*p)->positionOfTerm, ODR_CONTEXT, 6, 1)&&
        odr_explicit(o, z_ListEntries, &(*p)->entries, ODR_CONTEXT, 7, 1) &&
        odr_implicit(o, odr_oid, &(*p)->attributeSet, ODR_CONTEXT, 8, 1) &&
+       z_OtherInformation(o, &(*p)->otherInfo, 1) &&
        odr_sequence_end(o);
 }