/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1998, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.38 1995-09-27 15:02:40 quinn
+ * Revision 1.56 1998-08-19 16:10:04 adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.55 1998/02/11 11:53:32 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.54 1996/11/11 13:14:46 adam
+ * Fixed tagging bug in z_ProximityOperator.
+ *
+ * Revision 1.53 1996/10/09 15:54:55 quinn
+ * Added SearchInfoReport
+ *
+ * Revision 1.52 1996/10/08 12:56:57 adam
+ * Bug fix: tagging of type 101 query.
+ *
+ * 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
+ * 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
+ * Added links to access control PDUs
+ *
+ * Revision 1.40 1996/01/02 11:46:40 quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ *
+ * Revision 1.39 1995/09/29 17:11:53 quinn
+ * Smallish
+ *
+ * Revision 1.38 1995/09/27 15:02:40 quinn
* Modified function heads & prototypes.
*
* Revision 1.37 1995/08/21 09:10:15 quinn
* We'll use a general octetstring here, since string operations are
* clumsy on long strings.
*/
-int MDF z_SUTRS(ODR o, Odr_oct **p, int opt)
+int z_SUTRS(ODR o, Odr_oct **p, int opt)
{
return odr_implicit(o, odr_octetstring, p, ODR_UNIVERSAL,
ODR_GENERALSTRING, opt);
return odr_implicit(o, odr_octetstring, (Odr_oct**) p, ODR_CONTEXT, 2, opt);
}
-int MDF z_DatabaseName(ODR o, Z_DatabaseName **p, int opt)
+int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt)
{
return odr_implicit(o, odr_visiblestring, (char **) p, ODR_CONTEXT, 105,
opt);
opt);
}
-int MDF z_ElementSetName(ODR o, char **p, int opt)
+int z_ElementSetName(ODR o, char **p, int opt)
{
return odr_implicit(o, odr_visiblestring, p, ODR_CONTEXT, 103, opt);
}
11, opt);
}
-int MDF z_InternationalString(ODR o, char **p, int opt)
+int z_InternationalString(ODR o, char **p, int opt)
{
return odr_generalstring(o, p, opt);
}
odr_sequence_end(o);
}
-int MDF z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
+int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
{
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_OtherInfo_characterInfo,
odr_visiblestring},
{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_OtherInfo_binaryInfo,
- odr_octetstring},
+ (Odr_fun)odr_octetstring},
{ODR_IMPLICIT, ODR_CONTEXT, 4, Z_OtherInfo_externallyDefinedInfo,
- z_External},
- {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_OtherInfo_oid, odr_oid},
+ (Odr_fun)z_External},
+ {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_OtherInfo_oid, (Odr_fun)odr_oid},
{-1, -1, -1, -1, 0}
};
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);
}
-int MDF z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
+int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_OtherInformation *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
odr_implicit_settag(o, ODR_CONTEXT, 201);
- if (odr_sequence_of(o, z_OtherInformationUnit, &(*p)->list,
+ if (odr_sequence_of(o, (Odr_fun)z_OtherInformationUnit, &(*p)->list,
&(*p)->num_elements))
return 1;
*p = 0;
return opt && odr_ok(o);
}
-int MDF z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
+int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
{
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_StringOrNumeric_string,
odr_visiblestring},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_StringOrNumeric_numeric,
- odr_integer},
+ (Odr_fun)odr_integer},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_StringOrNumeric *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
/*
* check tagging!!
*/
-int MDF z_Unit(ODR o, Z_Unit **p, int opt)
+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) &&
odr_sequence_end(o);
}
-int MDF z_IntUnit(ODR o, Z_IntUnit **p, int opt)
+int z_IntUnit(ODR o, Z_IntUnit **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
odr_sequence_end(o);
}
+int z_StringList(ODR o, Z_StringList **p, int opt)
+{
+ if (o->direction == ODR_DECODE)
+ *p = (Z_StringList *)odr_malloc(o, sizeof(**p));
+ else if (!*p)
+ return opt;
+ if (odr_sequence_of(o, (Odr_fun)z_InternationalString, &(*p)->strings,
+ &(*p)->num_strings))
+ return 1;
+ *p = 0;
+ return opt && odr_ok(o);
+}
+
/* ---------------------- INITIALIZE SERVICE ------------------- */
#if 0
-int MDF z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
+int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
odr_sequence_end(o);
}
-int MDF z_StrAuthentication(ODR o, char **p, int opt)
+int z_StrAuthentication(ODR o, char **p, int opt)
{
return odr_visiblestring(o, p, opt);
}
static Odr_arm arm[] =
{
{-1, -1, -1, Z_IdAuthentication_open, z_StrAuthentication},
- {-1, -1, -1, Z_IdAuthentication_idPass, z_IdPass},
- {-1, -1, -1, Z_IdAuthentication_anonymous, odr_null},
- {-1, -1, -1, Z_IdAuthentication_other, z_External},
+ {-1, -1, -1, Z_IdAuthentication_idPass, (Odr_fun)z_IdPass},
+ {-1, -1, -1, Z_IdAuthentication_anonymous, (Odr_fun)odr_null},
+ {-1, -1, -1, Z_IdAuthentication_other, (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_IdAuthentication *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
int z_DatabaseSpecific(ODR o, Z_DatabaseSpecific **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_DatabaseSpecific *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
odr_implicit_settag(o, ODR_CONTEXT, 1);
- if (odr_sequence_of(o, z_DatabaseSpecificUnit, &(*p)->elements,
+ if (odr_sequence_of(o, (Odr_fun)z_DatabaseSpecificUnit, &(*p)->elements,
&(*p)->num_elements))
return 1;
*p = 0;
{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_ElementSetNames_generic,
z_ElementSetName},
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSetNames_databaseSpecific,
- z_DatabaseSpecific},
+ (Odr_fun)z_DatabaseSpecific},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ElementSetNames *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt && odr_ok(o);
return opt && odr_ok(o);
return
odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- odr_sequence_of(o, z_StringOrNumeric, &(*p)->list,
+ odr_sequence_of(o, (Odr_fun)z_StringOrNumeric, &(*p)->list,
&(*p)->num_list) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- (odr_sequence_of(o, odr_integer, &(*p)->semanticAction,
+ (odr_sequence_of(o, (Odr_fun)odr_integer, &(*p)->semanticAction,
&(*p)->num_semanticAction) || odr_ok(o)) &&
odr_sequence_end(o);
}
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 121, Z_AttributeValue_numeric,
- odr_integer},
+ (Odr_fun)odr_integer},
{ODR_IMPLICIT, ODR_CONTEXT, 224, Z_AttributeValue_complex,
- z_ComplexAttribute},
+ (Odr_fun)z_ComplexAttribute},
{-1, -1, -1, -1, 0}
};
#endif
odr_sequence_end(o);
}
-int MDF z_Term(ODR o, Z_Term **p, int opt)
+int z_Term(ODR o, Z_Term **p, int opt)
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_Term_general, odr_octetstring},
- {ODR_IMPLICIT, ODR_CONTEXT, 215, Z_Term_numeric, odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_Term_general, (Odr_fun)odr_octetstring},
+ {ODR_IMPLICIT, ODR_CONTEXT, 215, Z_Term_numeric, (Odr_fun)odr_integer},
{ODR_IMPLICIT, ODR_CONTEXT, 216, Z_Term_characterString,
odr_visiblestring},
- {ODR_IMPLICIT, ODR_CONTEXT, 217, Z_Term_oid, odr_oid},
+ {ODR_IMPLICIT, ODR_CONTEXT, 217, Z_Term_oid, (Odr_fun)odr_oid},
{ODR_IMPLICIT, ODR_CONTEXT, 218, Z_Term_dateTime, odr_cstring},
- {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external, z_External},
+ {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external, (Odr_fun)z_External},
/* add intUnit here */
- {ODR_IMPLICIT, ODR_CONTEXT, 221, Z_Term_null, odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 221, Z_Term_null, (Odr_fun)odr_null},
{-1, -1, -1, -1, 0}
};
if (o->direction ==ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Term *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return opt && odr_ok(o);
return
odr_implicit_settag(o, ODR_CONTEXT, 44) &&
- odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
+ odr_sequence_of(o, (Odr_fun)z_AttributeElement, &(*p)->attributeList,
&(*p)->num_attributes) &&
z_Term(o, &(*p)->term, 0) &&
odr_sequence_end(o);
return
z_ResultSetId(o, &(*p)->resultSet, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 44) &&
- odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
+ odr_sequence_of(o, (Odr_fun)z_AttributeElement, &(*p)->attributeList,
&(*p)->num_attributes) &&
odr_sequence_end(o);
}
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_known, odr_integer},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_private, odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_known, (Odr_fun)odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ProxCode_private, (Odr_fun)odr_integer},
{-1, -1, -1, -1, 0}
};
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Operator_and, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Operator_or, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Operator_and_not, odr_null},
- {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Operator_prox, z_ProximityOperator},
+ {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Operator_and, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Operator_or, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Operator_and_not, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Operator_prox, (Odr_fun)z_ProximityOperator},
{-1, -1, -1, -1, 0}
};
if (!odr_constructed_begin(o, p, ODR_CONTEXT, 46))
return opt && odr_ok(o);
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Operator *)odr_malloc(o, sizeof(**p));
if (odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
odr_constructed_end(o))
{
static Odr_arm arm[] =
{
- {-1, -1, -1, Z_Operand_APT, z_AttributesPlusTerm},
- {-1, -1, -1, Z_Operand_resultSetId, z_ResultSetId},
- {-1, -1, -1, Z_Operand_resultAttr, z_ResultSetPlusAttributes},
+ {-1, -1, -1, Z_Operand_APT, (Odr_fun)z_AttributesPlusTerm},
+ {-1, -1, -1, Z_Operand_resultSetId, (Odr_fun)z_ResultSetId},
+ {-1, -1, -1, Z_Operand_resultAttr, (Odr_fun)z_ResultSetPlusAttributes},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Operand *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return
z_RPNStructure(o, &(*p)->s1, 0) &&
z_RPNStructure(o, &(*p)->s2, 0) &&
- z_Operator(o, &(*p)->operator, 0) &&
+ z_Operator(o, &(*p)->roperator, 0) &&
odr_sequence_end(o);
}
{
static Odr_arm arm[] =
{
- {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_RPNStructure_simple, z_Operand},
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_RPNStructure_complex, z_Complex},
+ {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_RPNStructure_simple, (Odr_fun)z_Operand},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_RPNStructure_complex, (Odr_fun)z_Complex},
{-1 -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_RPNStructure *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Query_type_1, z_RPNQuery},
- {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Query_type_2, odr_octetstring},
- {ODR_EXPLICIT, ODR_CONTEXT, 101, Z_Query_type_101, z_RPNQuery},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Query_type_1, (Odr_fun)z_RPNQuery},
+ {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Query_type_2, (Odr_fun)odr_octetstring},
+ {ODR_IMPLICIT, ODR_CONTEXT, 101, Z_Query_type_101, (Odr_fun)z_RPNQuery},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Query *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
#ifdef Z_95
-int MDF z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
+int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
{
static Odr_arm arm[] =
{
odr_sequence_end(o);
}
-int MDF z_DiagRec(ODR o, Z_DiagRec **p, int opt)
+int z_DiagRec(ODR o, Z_DiagRec **p, int opt)
{
static Odr_arm arm[] =
{
- {-1, -1, -1, Z_DiagRec_defaultFormat, z_DefaultDiagFormat},
- {-1, -1, -1, Z_DiagRec_externallyDefined, z_External},
+ {-1, -1, -1, Z_DiagRec_defaultFormat, (Odr_fun)z_DefaultDiagFormat},
+ {-1, -1, -1, Z_DiagRec_externallyDefined, (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_DiagRec *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_DiagRecs *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs,
+ if (odr_sequence_of(o, (Odr_fun)z_DiagRec, &(*p)->diagRecs,
&(*p)->num_diagRecs))
return 1;
*p = 0;
- return 0;
+ return opt && odr_ok(o);
}
int z_NamePlusRecord(ODR o, Z_NamePlusRecord **p, int opt)
static Odr_arm arm[] =
{
{ODR_EXPLICIT, ODR_CONTEXT, 1, Z_NamePlusRecord_databaseRecord,
- z_DatabaseRecord},
+ (Odr_fun)z_DatabaseRecord},
{ODR_EXPLICIT, ODR_CONTEXT, 2, Z_NamePlusRecord_surrogateDiagnostic,
- z_DiagRec},
+ (Odr_fun)z_DiagRec},
{-1, -1, -1, -1, 0}
};
int z_NamePlusRecordList(ODR o, Z_NamePlusRecordList **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_NamePlusRecordList *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_NamePlusRecord, &(*p)->records,
+ if (odr_sequence_of(o, (Odr_fun)z_NamePlusRecord, &(*p)->records,
&(*p)->num_records))
return 1;
*p = 0;
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_Records_DBOSD, z_NamePlusRecordList},
- {ODR_IMPLICIT, ODR_CONTEXT, 130, Z_Records_NSD, z_DiagRec},
+ {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_Records_DBOSD, (Odr_fun)z_NamePlusRecordList},
+ {ODR_IMPLICIT, ODR_CONTEXT, 130, Z_Records_NSD, (Odr_fun)z_DiagRec},
{ODR_IMPLICIT, ODR_CONTEXT, 205, Z_Records_multipleNSD,
- z_DiagRecs},
+ (Odr_fun)z_DiagRecs},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Records *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 37, Z_AccessRequest_simpleForm,
- odr_octetstring},
+ (Odr_fun)odr_octetstring},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessRequest_externallyDefined,
- z_External},
+ (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
if (!odr_sequence_begin(o, p, sizeof(**p)))
static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 38, Z_AccessResponse_simpleForm,
- odr_octetstring},
+ (Odr_fun)odr_octetstring},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessResponse_externallyDefined,
- z_External},
+ (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
if (!odr_sequence_begin(o, p, sizeof(**p)))
/* ------------------------ SCAN SERVICE -------------------- */
-int MDF z_AttributeList(ODR o, Z_AttributeList **p, int opt)
+int z_AttributeList(ODR o, Z_AttributeList **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_AttributeList *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
odr_implicit_settag(o, ODR_CONTEXT, 44);
- if (odr_sequence_of(o, z_AttributeElement, &(*p)->attributes,
+ if (odr_sequence_of(o, (Odr_fun)z_AttributeElement, &(*p)->attributes,
&(*p)->num_attributes))
return 1;
*p = 0;
if (!odr_implicit_settag(o, ODR_CONTEXT, 44))
return 0;
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
- if (!odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
+ *p = (Z_AttributesPlusTerm*)odr_malloc(o, sizeof(**p));
+ if (!odr_sequence_of(o, (Odr_fun)z_AttributeElement, &(*p)->attributeList,
&(*p)->num_attributes))
return 0;
if (!odr_sequence_end(o) || !odr_sequence_end(o))
int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_AlternativeTerm *)odr_malloc(o, sizeof(**p));
else if (!*p)
{
o->t_class = -1;
return opt && odr_ok(o);
}
- if (odr_sequence_of(o, z_AttributesPlusTerm, &(*p)->terms,
+ if (odr_sequence_of(o, (Odr_fun)z_AttributesPlusTerm, &(*p)->terms,
&(*p)->num_terms))
return 1;
*p = 0;
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, (Odr_fun)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_fun)odr_integer},
+ {ODR_EXPLICIT, ODR_CONTEXT, 3, Z_ScanOccurrences_byDatabase,
+ (Odr_fun)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, (Odr_fun)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)))
odr_sequence_end(o);
}
+#endif
+
int z_TermInfo(ODR o, Z_TermInfo **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
(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) &&
2, 1) &&
odr_implicit(o, z_OccurrenceByAttributes, &(*p)->byAttributes,
ODR_CONTEXT, 3, 1) &&
+ z_OtherInformation(o, &(*p)->otherTermInfo, 1) &&
odr_sequence_end(o);
}
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Entry_termInfo, z_TermInfo},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Entry_termInfo, (Odr_fun)z_TermInfo},
{ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Entry_surrogateDiagnostic,
- z_DiagRec},
+ (Odr_fun)z_DiagRec},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Entry *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
int z_Entries(ODR o, Z_Entries **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_Entries *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
- if (odr_sequence_of(o, z_Entry, &(*p)->entries,
+ if (odr_sequence_of(o, (Odr_fun)z_Entry, &(*p)->entries,
&(*p)->num_entries))
return 1;
*p = 0;
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ListEntries_entries, z_Entries},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ListEntries_entries, (Odr_fun)z_Entries},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ListEntries_nonSurrogateDiagnostics,
- z_DiagRecs},
+ (Odr_fun)z_DiagRecs},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ListEntries *)odr_malloc(o, sizeof(**p));
else if (!*p)
return 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);
}
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSpec_elementSetName,
odr_visiblestring},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementSpec_externalSpec,
- z_External},
+ (Odr_fun)z_External},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_ElementSpec *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
return opt && odr_ok(o);
}
-int MDF z_Specification(ODR o, Z_Specification **p, int opt)
+int z_Specification(ODR o, Z_Specification **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
1, 0) &&
odr_implicit(o, z_Specification, &(*p)->generic, ODR_CONTEXT, 2, 1) &&
odr_implicit_settag(o, ODR_CONTEXT, 3) &&
- (odr_sequence_of(o, z_DbSpecific, &(*p)->dbSpecific,
+ (odr_sequence_of(o, (Odr_fun)z_DbSpecific, &(*p)->dbSpecific,
&(*p)->num_dbSpecific) || odr_ok(o)) &&
odr_implicit_settag(o, ODR_CONTEXT, 4) &&
- (odr_sequence_of(o, odr_oid, &(*p)->recordSyntax,
+ (odr_sequence_of(o, (Odr_fun)odr_oid, &(*p)->recordSyntax,
&(*p)->num_recordSyntax) || odr_ok(o)) &&
odr_sequence_end(o);
}
static Odr_arm arm[] =
{
{ODR_EXPLICIT, ODR_CONTEXT, 19, Z_RecordComp_simple,
- z_ElementSetNames},
+ (Odr_fun)z_ElementSetNames},
{ODR_IMPLICIT, ODR_CONTEXT, 209, Z_RecordComp_complex,
- z_CompSpec},
+ (Odr_fun)z_CompSpec},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_RecordComposition *)odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
29, 0) &&
#ifdef Z_95
odr_implicit_settag(o, ODR_CONTEXT, 212) &&
- (odr_sequence_of(o, z_Range, &(*p)->additionalRanges,
+ (odr_sequence_of(o, (Odr_fun)z_Range, &(*p)->additionalRanges,
&(*p)->num_ranges) || odr_ok(o)) &&
z_RecordComposition(o, &(*p)->recordComposition, 1) &&
#else
z_ReferenceId(o, &(*p)->referenceId, 1) &&
odr_implicit(o, odr_integer, &(*p)->deleteFunction, ODR_CONTEXT, 32,
0) &&
- (odr_sequence_of(o, z_ListStatus, &(*p)->resultSetList,
- &(*p)->num_ids) || odr_ok(o)) &&
+ (odr_sequence_of(o, z_ResultSetId, &(*p)->resultSetList,
+ &(*p)->num_resultSetList) || odr_ok(o)) &&
#ifdef Z_95
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
#endif
odr_sequence_end(o);
}
+int z_ListStatuses (ODR o, Z_ListStatuses **p, int opt)
+{
+ if (!odr_initmember (o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ if (odr_sequence_of (o, (Odr_fun) z_ListStatus, &(*p)->elements,
+ &(*p)->num))
+ return 1;
+ *p = 0;
+ return opt && odr_ok(o);
+}
+
int z_DeleteResultSetResponse(ODR o, Z_DeleteResultSetResponse **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return
z_ReferenceId(o, &(*p)->referenceId, 1) &&
odr_implicit(o, z_DeleteSetStatus, &(*p)->deleteOperationStatus,
- ODR_CONTEXT, 0, 1) &&
- odr_implicit_settag(o, ODR_CONTEXT, 1) &&
- (odr_sequence_of(o, z_ListStatus, &(*p)->deleteListStatuses,
- &(*p)->num_statuses) || odr_ok(o)) &&
+ ODR_CONTEXT, 0, 0) &&
+ odr_implicit (o, z_ListStatuses,
+ &(*p)->deleteListStatuses, ODR_CONTEXT, 1, 1) &&
odr_implicit(o, odr_integer, &(*p)->numberNotDeleted, ODR_CONTEXT,
34, 1) &&
- odr_implicit_settag(o, ODR_CONTEXT, 35) &&
- (odr_sequence_of(o, z_ListStatus, &(*p)->bulkStatuses,
- &(*p)->num_bulkStatuses) || odr_ok(o)) &&
+ odr_implicit (o, z_ListStatuses,
+ &(*p)->bulkStatuses, ODR_CONTEXT, 35, 1) &&
odr_implicit(o, odr_visiblestring, &(*p)->deleteMessage, ODR_CONTEXT,
36, 1) &&
#ifdef Z_95
odr_implicit(o, odr_integer, &(*p)->numberOfRecordsReturned,
ODR_CONTEXT, 24, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 0) &&
- odr_sequence_of(o, z_NamePlusRecord, &(*p)->segmentRecords,
+ odr_sequence_of(o, (Odr_fun)z_NamePlusRecord, &(*p)->segmentRecords,
&(*p)->num_segmentRecords) &&
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
odr_sequence_end(o);
/* ------------------------ APDU ------------------------- */
-int MDF z_Permissions(ODR o, Z_Permissions **p, int opt)
+int z_Permissions(ODR o, Z_Permissions **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
odr_implicit(o, z_InternationalString, &(*p)->userId, ODR_CONTEXT,
1, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 2) &&
- odr_sequence_of(o, odr_integer, &(*p)->allowableFunctions,
+ odr_sequence_of(o, (Odr_fun)odr_integer, &(*p)->allowableFunctions,
&(*p)->num_allowableFunctions) &&
odr_sequence_end(o);
}
z_ReferenceId(o, &(*p)->referenceId, 1) &&
odr_implicit(o, odr_integer, &(*p)->operationStatus, ODR_CONTEXT, 3, 0) &&
odr_implicit_settag(o, ODR_CONTEXT, 4) &&
- (odr_sequence_of(o, z_DiagRec, &(*p)->diagnostics,
+ (odr_sequence_of(o, (Odr_fun)z_DiagRec, &(*p)->diagnostics,
&(*p)->num_diagnostics) || odr_ok(o)) &&
odr_implicit(o, z_External, &(*p)->taskPackage, ODR_CONTEXT, 5, 1) &&
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
odr_sequence_end(o);
}
+/* ------------------------ SORT ------------------------- */
+
+int z_SortAttributes(ODR o, Z_SortAttributes **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ return
+ odr_oid(o, &(*p)->id, 0) &&
+ z_AttributeList(o, &(*p)->list, 0) &&
+ odr_sequence_end(o);
+}
+
+int z_SortKey(ODR o, Z_SortKey **p, int opt)
+{
+ static Odr_arm arm[] =
+ {
+ {ODR_IMPLICIT, ODR_CONTEXT, 0, Z_SortKey_sortField,
+ z_InternationalString},
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortKey_elementSpec, (Odr_fun)z_Specification},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortKey_sortAttributes,
+ (Odr_fun)z_SortAttributes},
+ {-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_SortDbSpecific(ODR o, Z_SortDbSpecific **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ return
+ z_DatabaseName(o, &(*p)->databaseName, 0) &&
+ z_SortKey(o, &(*p)->dbSort, 0) &&
+ odr_sequence_end(o);
+}
+
+int z_SortDbSpecificList(ODR o, Z_SortDbSpecificList **p, int opt)
+{
+ if (!odr_initmember(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ if (odr_sequence_of(o, (Odr_fun)z_SortDbSpecific, &(*p)->dbSpecific,
+ &(*p)->num_dbSpecific))
+ return 1;
+ *p = 0;
+ return opt && odr_ok(o);
+}
+
+int z_SortElement(ODR o, Z_SortElement **p, int opt)
+{
+ static Odr_arm arm[] =
+ {
+ {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_SortElement_generic, (Odr_fun)z_SortKey},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortElement_databaseSpecific,
+ (Odr_fun)z_SortDbSpecificList},
+ {-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_SortMissingValueAction(ODR o, Z_SortMissingValueAction **p, int opt)
+{
+ static Odr_arm arm[] =
+ {
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_SortMissingValAct_abort, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_SortMissingValAct_null, (Odr_fun)odr_null},
+ {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_SortMissingValAct_valData,
+ (Odr_fun)odr_octetstring},
+ {-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_SortKeySpec(ODR o, Z_SortKeySpec **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ return
+ z_SortElement(o, &(*p)->sortElement, 0) &&
+ odr_implicit(o, odr_integer, &(*p)->sortRelation, ODR_CONTEXT, 1, 0) &&
+ odr_implicit(o, odr_integer, &(*p)->caseSensitivity, ODR_CONTEXT,
+ 2, 0) &&
+ odr_explicit(o, z_SortMissingValueAction, &(*p)->missingValueAction,
+ ODR_CONTEXT, 3, 1) &&
+ odr_sequence_end(o);
+}
+
+int z_SortResponse(ODR o, Z_SortResponse **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)->sortStatus, ODR_CONTEXT,
+ 3, 0) &&
+ odr_implicit(o, odr_integer, &(*p)->resultSetStatus, ODR_CONTEXT,
+ 4, 1) &&
+ odr_implicit(o, z_DiagRecs, &(*p)->diagnostics, ODR_CONTEXT, 5, 1) &&
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+ odr_sequence_end(o);
+}
+
+int z_SortKeySpecList(ODR o, Z_SortKeySpecList **p, int opt)
+{
+ if (!odr_initmember(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ if (odr_sequence_of(o, (Odr_fun)z_SortKeySpec, &(*p)->specs, &(*p)->num_specs))
+ return 1;
+ *p = 0;
+ return opt && odr_ok(o);
+}
+
+int z_SortRequest(ODR o, Z_SortRequest **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_StringList, &(*p)->inputResultSetNames,
+ ODR_CONTEXT, 3, 0) &&
+ odr_implicit(o, z_InternationalString, &(*p)->sortedResultSetName,
+ ODR_CONTEXT, 4, 0) &&
+ odr_implicit(o, z_SortKeySpecList, &(*p)->sortSequence, ODR_CONTEXT,
+ 5, 0) &&
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+ 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 MDF z_APDU(ODR o, Z_APDU **p, int opt)
+int z_APDU(ODR o, Z_APDU **p, int opt)
{
static Odr_arm arm[] =
{
- {ODR_IMPLICIT, ODR_CONTEXT, 20, Z_APDU_initRequest, z_InitRequest},
- {ODR_IMPLICIT, ODR_CONTEXT, 21, Z_APDU_initResponse, z_InitResponse},
- {ODR_IMPLICIT, ODR_CONTEXT, 22, Z_APDU_searchRequest, z_SearchRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 20, Z_APDU_initRequest, (Odr_fun)z_InitRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 21, Z_APDU_initResponse, (Odr_fun)z_InitResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 22, Z_APDU_searchRequest, (Odr_fun)z_SearchRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 23, Z_APDU_searchResponse,
- z_SearchResponse},
+ (Odr_fun)z_SearchResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 24, Z_APDU_presentRequest,
- z_PresentRequest},
+ (Odr_fun)z_PresentRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 25, Z_APDU_presentResponse,
- z_PresentResponse},
+ (Odr_fun)z_PresentResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 26, Z_APDU_deleteResultSetRequest,
- z_DeleteResultSetRequest},
+ (Odr_fun)z_DeleteResultSetRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 27, Z_APDU_deleteResultSetResponse,
- z_DeleteResultSetResponse},
+ (Odr_fun)z_DeleteResultSetResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_APDU_accessControlRequest,
+ (Odr_fun)z_AccessControlRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 29, Z_APDU_accessControlResponse,
+ (Odr_fun)z_AccessControlResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 30, Z_APDU_resourceControlRequest,
- z_ResourceControlRequest},
+ (Odr_fun)z_ResourceControlRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 31, Z_APDU_resourceControlResponse,
- z_ResourceControlResponse},
+ (Odr_fun)z_ResourceControlResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 32, Z_APDU_triggerResourceControlRequest,
- z_TriggerResourceControlRequest},
- {ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, z_ScanRequest},
- {ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, z_ScanResponse},
- {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_APDU_segmentRequest, z_Segment},
+ (Odr_fun)z_TriggerResourceControlRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 33, Z_APDU_resourceReportRequest,
+ (Odr_fun)z_ResourceReportRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 34, Z_APDU_resourceReportResponse,
+ (Odr_fun)z_ResourceReportResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, (Odr_fun)z_ScanRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, (Odr_fun)z_ScanResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 43, Z_APDU_sortRequest, (Odr_fun)z_SortRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 44, Z_APDU_sortResponse, (Odr_fun)z_SortResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_APDU_segmentRequest, (Odr_fun)z_Segment},
{ODR_IMPLICIT, ODR_CONTEXT, 46, Z_APDU_extendedServicesRequest,
- z_ExtendedServicesRequest},
+ (Odr_fun)z_ExtendedServicesRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 47, Z_APDU_extendedServicesResponse,
- z_ExtendedServicesResponse},
- {ODR_IMPLICIT, ODR_CONTEXT, 48, Z_APDU_close, z_Close},
+ (Odr_fun)z_ExtendedServicesResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 48, Z_APDU_close, (Odr_fun)z_Close},
{-1, -1, -1, -1, 0}
};
if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
+ *p = (Z_APDU *)odr_malloc(o, sizeof(**p));
+ odr_setlenlen(o, 5);
if (!odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
if (o->direction == ODR_DECODE)
projects / yaz-moved-to-github.git / blobdiff