* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.32 1995-06-19 12:37:28 quinn
+ * Revision 1.36 1995-08-15 11:59:39 quinn
+ * Updated External
+ *
+ * Revision 1.35 1995/08/10 08:53:59 quinn
+ * Added Explain
+ *
+ * Revision 1.34 1995/06/19 17:01:48 quinn
+ * This should bring us in sync with the version distributed as 1.0b
+ *
+ * Revision 1.33 1995/06/19 13:39:56 quinn
+ * *** empty log message ***
+ *
+ * Revision 1.32 1995/06/19 12:37:28 quinn
* Fixed a bug in the compspec.
*
* Revision 1.31 1995/06/16 13:15:56 quinn
opt);
}
-int z_UserInformationField(ODR o, Odr_external **p, int opt)
+int z_ElementSetName(ODR o, char **p, int opt)
+{
+ return odr_implicit(o, odr_visiblestring, p, ODR_CONTEXT, 103, opt);
+}
+
+int z_UserInformationField(ODR o, Z_External **p, int opt)
{
- return odr_explicit(o, odr_external, (Odr_external **)p, ODR_CONTEXT,
+ return odr_explicit(o, z_External, (Z_External **)p, ODR_CONTEXT,
11, opt);
}
{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_OtherInfo_binaryInfo,
odr_octetstring},
{ODR_IMPLICIT, ODR_CONTEXT, 4, Z_OtherInfo_externallyDefinedInfo,
- odr_external},
+ z_External},
{ODR_IMPLICIT, ODR_CONTEXT, 5, Z_OtherInfo_oid, odr_oid},
{-1, -1, -1, -1, 0}
};
{-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, odr_external},
+ {-1, -1, -1, Z_IdAuthentication_other, z_External},
{-1, -1, -1, -1, 0}
};
return
z_ReferenceId(o, &(*p)->referenceId, 1) &&
odr_implicit(o, odr_bool, &(*p)->suspendedFlag, ODR_CONTEXT, 39, 1)&&
- odr_explicit(o, odr_external, &(*p)->resourceReport, ODR_CONTEXT,
+ odr_explicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT,
40, 1) &&
odr_implicit(o, odr_integer, &(*p)->partialResultsAvailable,
ODR_CONTEXT, 41, 1) &&
/* ------------------------ SEARCH SERVICE ----------------------- */
-int z_ElementSetName(ODR o, char **p, int opt)
-{
- return odr_implicit(o, odr_visiblestring, (char**) p, ODR_CONTEXT, 103,
- opt);
-}
-
int z_DatabaseSpecificUnit(ODR o, Z_DatabaseSpecificUnit **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
if (o->direction == ODR_DECODE)
*p = odr_malloc(o, sizeof(**p));
- else
+ else if (!*p)
return opt && odr_ok(o);
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
odr_visiblestring},
{ODR_IMPLICIT, ODR_CONTEXT, 217, Z_Term_oid, odr_oid},
{ODR_IMPLICIT, ODR_CONTEXT, 218, Z_Term_dateTime, odr_cstring},
- {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external, odr_external},
+ {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external, z_External},
/* add intUnit here */
{ODR_IMPLICIT, ODR_CONTEXT, 221, Z_Term_null, odr_null},
{-1, -1, -1, -1, 0}
int z_DatabaseRecord(ODR o, Z_DatabaseRecord **p, int opt)
{
- return odr_external(o, (Odr_external **) p, opt);
+ return z_External(o, (Z_External **) p, opt);
}
#ifdef Z_95
{-1, -1, -1, Z_DiagForm_v2AddInfo, odr_visiblestring},
{-1, -1, -1, Z_DiagForm_v3AddInfo, z_InternationalString},
{ODR_IMPLICIT, ODR_CONTEXT, ODR_VISIBLESTRING, Z_DiagForm_v2AddInfo,
- odr_visiblestring}, /* to match some weird server.. */
+ odr_visiblestring}, /* To cater to a bug in the CNIDR servers */
{-1, -1, -1, -1, 0}
};
if (!odr_sequence_begin(o, p, sizeof(**p)))
static Odr_arm arm[] =
{
{-1, -1, -1, Z_DiagRec_defaultFormat, z_DefaultDiagFormat},
- {-1, -1, -1, Z_DiagRec_externallyDefined, odr_external},
+ {-1, -1, -1, Z_DiagRec_externallyDefined, z_External},
{-1, -1, -1, -1, 0}
};
{ODR_IMPLICIT, ODR_CONTEXT, 37, Z_AccessRequest_simpleForm,
odr_octetstring},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessRequest_externallyDefined,
- odr_external},
+ z_External},
{-1, -1, -1, -1, 0}
};
if (!odr_sequence_begin(o, p, sizeof(**p)))
{ODR_IMPLICIT, ODR_CONTEXT, 38, Z_AccessResponse_simpleForm,
odr_octetstring},
{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessResponse_externallyDefined,
- odr_external},
+ z_External},
{-1, -1, -1, -1, 0}
};
if (!odr_sequence_begin(o, p, sizeof(**p)))
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSpec_elementSetName,
odr_visiblestring},
{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementSpec_externalSpec,
- odr_external},
+ z_External},
{-1, -1, -1, -1, 0}
};
ODR_CONTEXT, 3, 1) &&
odr_implicit(o, odr_oid, &(*p)->resourceReportFormat, ODR_CONTEXT,
4, 1) &&
- odr_implicit(o, odr_external, &(*p)->resourceReport, ODR_CONTEXT,
+ odr_implicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT,
5, 1) &&
#ifdef Z_95
z_OtherInformation(o, &(*p)->otherInfo, 1) &&