X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=asn%2Fproto.c;h=f7437ee6f82064dce460f770bbf7781edc13371f;hb=bfd2f4429361a876789ef5329dc953ab6aa2ced0;hp=019d1442764edb08f988946b861eb99c839b71a3;hpb=892f7f56860a1ee8e8d816eeaec0387c54c1a0a7;p=yaz-moved-to-github.git

diff --git a/asn/proto.c b/asn/proto.c
index 019d144..f7437ee 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.11  1995-03-17 10:17:25  quinn
+ * Revision 1.13  1995-03-20 11:26:52  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.12  1995/03/20  09:45:09  quinn
+ * Working towards v3
+ *
+ * Revision 1.11  1995/03/17  10:17:25  quinn
  * Added memory management.
  *
  * Revision 1.10  1995/03/15  11:17:40  quinn
@@ -70,6 +76,42 @@ int z_UserInformationField(ODR o, Z_UserInformationField **p, int opt)
 
 /* ---------------------- INITIALIZE SERVICE ------------------- */
 
+int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt;
+    return
+    	odr_visiblestring(o, &(*p)->user, 0) &&
+    	odr_visiblestring(o, &(*p)->password, 0) &&
+    	odr_visiblestring(o, &(*p)->account, 0) &&
+    	odr_sequence_end(o);
+}
+
+int z_StrAuthentication(ODR o, char **p, int opt)
+{
+    return odr_visiblestring(o, p, opt);
+}
+
+#if 0
+int z_IdAuthentication(ODR o, Z_IdAuthentication **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+	{-1, -1, -1, Z_IdAuthentication_open, z_StrAuthentication},
+	{-1, -1, -1, Z_IdAuthentication_NSR, z_NSRAuthentication},
+	{-1, -1, -1, -1, 0}
+    };
+
+    if (o->direction == ODR_DECODE)
+    	*p = odr_malloc(o, sizeof(**p));
+
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+    	return 1;
+    *p = 0;
+    return opt && !o->error;
+}
+#endif
+
 int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
 {
     Z_InitRequest *pp;
@@ -86,7 +128,7 @@ int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
 	    5, 0) &&
 	odr_implicit(o, odr_integer, &pp->maximumRecordSize, ODR_CONTEXT,
 	    6, 0) &&
-	odr_explicit(o, odr_any, &pp->idAuthentication, ODR_CONTEXT,
+	odr_explicit(o, odr_null, &pp->idAuthentication, ODR_CONTEXT,
 	    7, 1) &&
 	odr_implicit(o, odr_visiblestring, &pp->implementationId, ODR_CONTEXT,
 	    110, 1) &&
@@ -125,22 +167,6 @@ int z_InitResponse(ODR o, Z_InitResponse **p, int opt)
 	odr_sequence_end(o);
 }
 
-int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
-{
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
-    	return opt;
-    return
-    	odr_visiblestring(o, &(*p)->user, 0) &&
-    	odr_visiblestring(o, &(*p)->password, 0) &&
-    	odr_visiblestring(o, &(*p)->account, 0) &&
-    	odr_sequence_end(o);
-}
-
-int z_StrAuthentication(ODR o, char **p, int opt)
-{
-    return odr_visiblestring(o, p, opt);
-}
-
 /* ------------------------ SEARCH SERVICE ----------------------- */
 
 int z_ElementSetName(ODR o, char **p, int opt)
@@ -360,9 +386,9 @@ int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt)
 	odr_implicit_settag(o, ODR_CONTEXT, 18) &&
 	odr_sequence_of(o, z_DatabaseName, &pp->databaseNames,
 	    &pp->num_databaseNames) &&
-	odr_implicit(o, z_ElementSetNames, &pp->smallSetElementSetNames,
+	odr_explicit(o, z_ElementSetNames, &pp->smallSetElementSetNames,
 	    ODR_CONTEXT, 100, 1) &&
-	odr_implicit(o, z_ElementSetNames, &pp->mediumSetElementSetNames,
+	odr_explicit(o, z_ElementSetNames, &pp->mediumSetElementSetNames,
 	    ODR_CONTEXT, 101, 1) &&
 	z_PreferredRecordSyntax(o, &pp->preferredRecordSyntax, 1) &&
 	odr_explicit(o, z_Query, &pp->query, ODR_CONTEXT, 21, 0) &&