X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fprt-ext.c;h=3206d876f4d970a4699d5aa9cdac9f3bb11cb872;hp=7c56703d483e6a1442aa6729ff084929e6b88af4;hb=3e8a6d354cf280b4a157796bae8d4ea713784247;hpb=85a2e7affad79fd8bd59b403ba7b5f7867d60523

diff --git a/asn/prt-ext.c b/asn/prt-ext.c
index 7c56703..3206d87 100644
--- a/asn/prt-ext.c
+++ b/asn/prt-ext.c
@@ -1,10 +1,40 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1999, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-ext.c,v $
- * Revision 1.12  1997-04-30 08:52:02  quinn
+ * Revision 1.21  1999-05-26 14:47:12  adam
+ * Implemented z_ext_record.
+ *
+ * Revision 1.20  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.19  1998/03/31 15:13:19  adam
+ * Development towards compiled ASN.1.
+ *
+ * Revision 1.18  1998/03/31 11:07:44  adam
+ * Furhter work on UNIverse resource report.
+ * Added Extended Services handling in frontend server.
+ *
+ * Revision 1.17  1998/03/20 14:46:06  adam
+ * Added UNIverse Resource Reports.
+ *
+ * Revision 1.16  1998/02/11 11:53:32  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.15  1998/02/10 15:31:46  adam
+ * Implemented date and time structure. Changed the Update Extended
+ * Service.
+ *
+ * Revision 1.14  1998/01/05 09:04:57  adam
+ * Fixed bugs in encoders/decoders - Not operator (!) missing.
+ *
+ * Revision 1.13  1997/05/14 06:53:22  adam
+ * C++ support.
+ *
+ * Revision 1.12  1997/04/30 08:52:02  quinn
  * Null
  *
  * Revision 1.11  1996/10/10  12:35:13  quinn
@@ -52,20 +82,26 @@
  */
 static Z_ext_typeent type_table[] =
 {
-    {VAL_SUTRS, Z_External_sutrs, z_SUTRS},
-    {VAL_EXPLAIN, Z_External_explainRecord, z_ExplainRecord},
-    {VAL_RESOURCE1, Z_External_resourceReport1, z_ResourceReport1},
-    {VAL_RESOURCE2, Z_External_resourceReport2, z_ResourceReport2},
-    {VAL_PROMPT1, Z_External_promptObject1, z_PromptObject1 },
-    {VAL_GRS1, Z_External_grs1, z_GenericRecord},
-    {VAL_EXTENDED, Z_External_extendedService, z_TaskPackage},
-    {VAL_ITEMORDER, Z_External_itemOrder, z_ItemOrder},
-    {VAL_DIAG1, Z_External_diag1, z_DiagnosticFormat},
-    {VAL_ESPEC1, Z_External_espec1, z_Espec1},
-    {VAL_SUMMARY, Z_External_summary, z_BriefBib},
-    {VAL_OPAC, Z_External_OPAC, z_OPACRecord},
-    {VAL_SEARCHRES1, Z_External_searchResult1, z_SearchInfoReport},
-    {VAL_DBUPDATE, Z_External_update, z_IUUpdate},
+    {VAL_SUTRS, Z_External_sutrs, (Odr_fun) z_SUTRS},
+    {VAL_EXPLAIN, Z_External_explainRecord, (Odr_fun)z_ExplainRecord},
+    {VAL_RESOURCE1, Z_External_resourceReport1, (Odr_fun)z_ResourceReport1},
+    {VAL_RESOURCE2, Z_External_resourceReport2, (Odr_fun)z_ResourceReport2},
+    {VAL_PROMPT1, Z_External_promptObject1, (Odr_fun)z_PromptObject1 },
+    {VAL_GRS1, Z_External_grs1, (Odr_fun)z_GenericRecord},
+    {VAL_EXTENDED, Z_External_extendedService, (Odr_fun)z_TaskPackage},
+#ifdef ASN_COMPILED
+    {VAL_ITEMORDER, Z_External_itemOrder, (Odr_fun)z_IOItemOrder},
+#else
+    {VAL_ITEMORDER, Z_External_itemOrder, (Odr_fun)z_ItemOrder},
+#endif
+    {VAL_DIAG1, Z_External_diag1, (Odr_fun)z_DiagnosticFormat},
+    {VAL_ESPEC1, Z_External_espec1, (Odr_fun)z_Espec1},
+    {VAL_SUMMARY, Z_External_summary, (Odr_fun)z_BriefBib},
+    {VAL_OPAC, Z_External_OPAC, (Odr_fun)z_OPACRecord},
+    {VAL_SEARCHRES1, Z_External_searchResult1, (Odr_fun)z_SearchInfoReport},
+    {VAL_DBUPDATE, Z_External_update, (Odr_fun)z_IUUpdate},
+    {VAL_DATETIME, Z_External_dateTime, (Odr_fun)z_DateTime},
+    {VAL_UNIVERSE_REPORT, Z_External_universeReport, (Odr_fun)z_UniverseReport},
     {VAL_NONE, 0, 0}
 };
 
@@ -79,46 +115,65 @@ Z_ext_typeent *z_ext_getentbyref(oid_value val)
     return 0;
 }
 
-int z_External(ODR o, Z_External **p, int opt)
+int z_External(ODR o, Z_External **p, int opt, const char *name)
 {
     oident *oid;
     Z_ext_typeent *type;
 
     static Odr_arm arm[] =
     {
-	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_single, odr_any},
-	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_External_octet, odr_octetstring},
-	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_External_arbitrary, odr_bitstring},
-
-	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_sutrs, z_SUTRS},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_single,
+	 (Odr_fun)odr_any, 0},
+	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_External_octet,
+	 (Odr_fun)odr_octetstring, 0},
+	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_External_arbitrary,
+	 (Odr_fun)odr_bitstring, 0},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_sutrs,
+	 (Odr_fun)z_SUTRS, 0},
 	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_explainRecord,
-	    z_ExplainRecord},
+	 (Odr_fun)z_ExplainRecord, 0},
 	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_resourceReport1,
-	    z_ResourceReport1},
+	 (Odr_fun)z_ResourceReport1, 0},
 	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_resourceReport2,
-	    z_ResourceReport2},
+	 (Odr_fun)z_ResourceReport2, 0},
 	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_promptObject1,
-	    z_PromptObject1},
-	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_grs1, z_GenericRecord},
+	 (Odr_fun)z_PromptObject1, 0},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_grs1,
+	 (Odr_fun)z_GenericRecord, 0},
 	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_extendedService,
-	    z_TaskPackage},
-	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_itemOrder, z_ItemOrder},
-	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_diag1, z_DiagnosticFormat},
-	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_espec1, z_Espec1},
-	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_summary, z_BriefBib},
-	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OPAC, z_OPACRecord},
+	 (Odr_fun)z_TaskPackage, 0},
+#ifdef ASN_COMPILED
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_itemOrder,
+	 (Odr_fun)z_IOItemOrder, 0},
+#else
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_itemOrder,
+	 (Odr_fun)z_ItemOrder, 0},
+#endif
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_diag1,
+	 (Odr_fun)z_DiagnosticFormat, 0},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_espec1,
+	 (Odr_fun)z_Espec1, 0},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_summary,
+	 (Odr_fun)z_BriefBib, 0},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OPAC,
+	 (Odr_fun)z_OPACRecord, 0},
 	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_searchResult1,
-	    z_SearchInfoReport},
-	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_update},
-	{-1, -1, -1, -1, 0}
+	 (Odr_fun)z_SearchInfoReport, 0},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_update,
+	 (Odr_fun)z_IUUpdate, 0},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_dateTime,
+	 (Odr_fun)z_DateTime, 0},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_universeReport,
+	 (Odr_fun)z_UniverseReport, 0},
+	{-1, -1, -1, -1, 0, 0}
     };
-
+    
     odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL);
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    if (!odr_sequence_begin(o, p, sizeof(**p), name))
 	return opt && odr_ok(o);
-    if (!(odr_oid(o, &(*p)->direct_reference, 1) &&
-	odr_integer(o, &(*p)->indirect_reference, 1) &&
-	odr_graphicstring(o, &(*p)->descriptor, 1)))
+    if (!(odr_oid(o, &(*p)->direct_reference, 1, 0) &&
+	  odr_integer(o, &(*p)->indirect_reference, 1, 0) &&
+	  odr_graphicstring(o, &(*p)->descriptor, 1, 0)))
 	return 0;
     /*
      * Do we know this beast?
@@ -127,17 +182,93 @@ int z_External(ODR o, Z_External **p, int opt)
 	(oid = oid_getentbyoid((*p)->direct_reference)) &&
 	(type = z_ext_getentbyref(oid->value)))
     {
-	int class, tag, cons;
-
+	int zclass, tag, cons;
+	
 	/*
 	 * We know it. If it's represented as an ASN.1 type, bias the CHOICE.
 	 */
-	if (!odr_peektag(o, &class, &tag, &cons))
+	if (!odr_peektag(o, &zclass, &tag, &cons))
 	    return opt && odr_ok(o);
-	if (class == ODR_CONTEXT && tag == 0 && cons == 1)
+	if (zclass == ODR_CONTEXT && tag == 0 && cons == 1)
 	    odr_choice_bias(o, type->what);
     }
     return
-	odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
+	odr_choice(o, arm, &(*p)->u, &(*p)->which, name) &&
 	odr_sequence_end(o);
 }
+
+Z_External *z_ext_record(ODR o, int format, const char *buf, int len)
+{
+    Z_External *thisext;
+    oident recform;
+    int oid[OID_SIZE];
+
+    thisext = (Z_External *) odr_malloc(o, sizeof(*thisext));
+    thisext->descriptor = 0;
+    thisext->indirect_reference = 0;
+
+    recform.proto = PROTO_Z3950;
+    recform.oclass = CLASS_RECSYN;
+    recform.value = (enum oid_value) format;
+    if (!oid_ent_to_oid(&recform, oid))
+	return 0;
+    thisext->direct_reference = odr_oiddup(o, oid);
+    thisext->indirect_reference = 0;
+    thisext->descriptor = 0;
+    
+    if (len < 0) /* Structured data */
+    {
+	switch (format)
+	{
+	case VAL_SUTRS:
+	    thisext->which = Z_External_sutrs;
+	    break;
+	case VAL_GRS1:
+	    thisext->which = Z_External_grs1;
+	    break;
+	case VAL_EXPLAIN:
+	    thisext->which = Z_External_explainRecord;
+	    break;
+	case VAL_SUMMARY:
+	    thisext->which = Z_External_summary;
+	    break;
+	case VAL_OPAC:
+	    thisext->which = Z_External_OPAC;
+	    break;
+	default:
+	    return 0;
+	}
+	
+	/*
+	 * We cheat on the pointers here. Obviously, the record field
+	 * of the backend-fetch structure should have been a union for
+	 * correctness, but we're stuck with this for backwards
+	 * compatibility.
+	 */
+	thisext->u.grs1 = (Z_GenericRecord*) buf;
+    }
+    else if (format == VAL_SUTRS) /* SUTRS is a single-ASN.1-type */
+    {
+	Odr_oct *sutrs = (Odr_oct *)odr_malloc(o, sizeof(*sutrs));
+	
+	thisext->which = Z_External_sutrs;
+	thisext->u.sutrs = sutrs;
+	sutrs->buf = (unsigned char *)odr_malloc(o, len);
+	sutrs->len = sutrs->size = len;
+	memcpy(sutrs->buf, buf, len);
+    }
+    else
+    {
+	thisext->which = Z_External_octet;
+	if (!(thisext->u.octet_aligned = (Odr_oct *)
+	      odr_malloc(o, sizeof(Odr_oct))))
+	    return 0;
+	if (!(thisext->u.octet_aligned->buf = (unsigned char *)
+	      odr_malloc(o, len)))
+	    return 0;
+	memcpy(thisext->u.octet_aligned->buf, buf, len);
+	thisext->u.octet_aligned->len = thisext->u.octet_aligned->size = len;
+    }
+    return thisext;
+}
+