* Sebastian Hammer, Adam Dickmeiss
*
* $Log: client.c,v $
- * Revision 1.51 1997-09-26 09:41:55 adam
+ * Revision 1.56 1997-11-05 09:18:31 adam
+ * The client handles records with no associated syntax.
+ *
+ * Revision 1.55 1997/10/31 12:20:08 adam
+ * Improved memory debugging for xmalloc/nmem.c. References to NMEM
+ * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
+ * Bug fix: missing fclose in data1_read_espec1.
+ *
+ * Revision 1.54 1997/10/27 13:52:46 adam
+ * Header yaz-util includes all YAZ utility header files.
+ *
+ * Revision 1.53 1997/09/29 13:18:59 adam
+ * Added function, oid_ent_to_oid, to replace the function
+ * oid_getoidbyent, which is not thread safe.
+ *
+ * Revision 1.52 1997/09/29 07:20:31 adam
+ * Client code uses nmem_init.
+ *
+ * Revision 1.51 1997/09/26 09:41:55 adam
* Updated client to handle multiple diagnostics.
*
* Revision 1.50 1997/09/17 12:10:29 adam
* to illustrate the use of the YAZ service-level API.
*/
-#include <yconfig.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <assert.h>
+#include <yaz-util.h>
+
#include <comstack.h>
#include <tcpip.h>
#ifdef USE_XTIMOSI
#include <proto.h>
#include <marcdisp.h>
#include <diagbib1.h>
-#include <options.h>
#include <pquery.h>
odr_reset(print);
}
}
-
/* Check if this is a known, ASN.1 type tucked away in an octet string */
if (ent && r->which == Z_External_octet)
{
r->which = type->what;
}
}
- if (ent->value == VAL_SOIF)
+ if (ent && ent->value == VAL_SOIF)
printf("%.*s", r->u.octet_aligned->len, r->u.octet_aligned->buf);
else if (r->which == Z_External_octet && p->u.octet_aligned->len)
{
if (marcdump)
fwrite (marc_buf, strlen (marc_buf), 1, marcdump);
}
- else if (ent->value == VAL_SUTRS)
+ else if (ent && ent->value == VAL_SUTRS)
{
if (r->which != Z_External_sutrs)
{
}
printf("%.*s", r->u.sutrs->len, r->u.sutrs->buf);
}
- else if (ent->value == VAL_GRS1)
+ else if (ent && ent->value == VAL_GRS1)
{
if (r->which != Z_External_grs1)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
Z_SearchRequest *req = apdu->u.searchRequest;
Z_Query query;
+ int oid[OID_SIZE];
#if CCL2RPN
struct ccl_rpn_node *rpn;
int error, pos;
prefsyn.oclass = CLASS_RECSYN;
prefsyn.value = recordsyntax;
req->preferredRecordSyntax =
- odr_oiddup(out, oid_getoidbyent(&prefsyn));
+ odr_oiddup(out, oid_ent_to_oid(&prefsyn, oid));
req->smallSetElementSetNames =
req->mediumSetElementSetNames = elementSetNames;
}
bib1.proto = protocol;
bib1.oclass = CLASS_ATTSET;
bib1.value = VAL_BIB1;
- RPNquery->attributeSetId = oid_getoidbyent(&bib1);
+ RPNquery->attributeSetId = oid_ent_to_oid(&bib1, oid);
query.u.type_1 = RPNquery;
ccl_rpn_delete (rpn);
break;
Z_RecordComposition compo;
oident prefsyn;
int nos = 1;
+ int oid[OID_SIZE];
char *p;
char setstring[100];
prefsyn.proto = protocol;
prefsyn.oclass = CLASS_RECSYN;
prefsyn.value = recordsyntax;
- req->preferredRecordSyntax = oid_getoidbyent(&prefsyn);
+ req->preferredRecordSyntax = oid_ent_to_oid(&prefsyn, oid);
+
if (elementSetNames)
{
req->recordComposition = &compo;
printf("Usage: format <recordsyntax>\n");
return 0;
}
- if (!strcmp(arg, "sutrs"))
- {
- printf("Preferred format is SUTRS.\n");
- recordsyntax = VAL_SUTRS;
- return 1;
- }
- else if (!strcmp(arg, "usmarc"))
- {
- printf("Preferred format is USMARC\n");
- recordsyntax = VAL_USMARC;
- return 1;
- }
- else if (!strcmp(arg, "danmarc"))
- {
- printf("Preferred format is DANMARC\n");
- recordsyntax = VAL_DANMARC;
- return 1;
- }
- else if (!strcmp(arg, "ukmarc"))
- {
- printf("Preferred format is UKMARC\n");
- recordsyntax = VAL_UKMARC;
- return 1;
- }
- else if (!strcmp(arg, "unimarc"))
- {
- printf("Preferred format is UNIMARC\n");
- recordsyntax = VAL_UNIMARC;
- return 1;
- }
- else if (!strcmp(arg, "grs1"))
- {
- printf("Preferred format is GRS1\n");
- recordsyntax = VAL_GRS1;
- return 1;
- }
- else if (!strcmp(arg, "soif"))
- {
- printf("Preferred format is SOIF\n");
- recordsyntax = VAL_SOIF;
- return 1;
- }
- else if (!strcmp(arg, "summary"))
+ recordsyntax = oid_getvalbyname (arg);
+ if (recordsyntax == VAL_NONE)
{
- printf("Preferred format is Summary\n");
- recordsyntax = VAL_SUMMARY;
- return 1;
- }
- else if (!strcmp(arg, "explain"))
- {
- printf("Preferred format is Explain\n");
- recordsyntax = VAL_EXPLAIN;
- return 1;
- }
- else
- {
- printf("Specify one of {sutrs,usmarc,danmarc,ukmarc,unimarc,grs1,summary,explain}.\n");
+ printf ("unknown record syntax\n");
return 0;
}
+ return 1;
}
int cmd_elements(char *arg)
#if CCL2RPN
FILE *inf;
#endif
-
+ nmem_init();
if (!(out = odr_createmem(ODR_ENCODE)) ||
!(in = odr_createmem(ODR_DECODE)) ||
!(print = odr_createmem(ODR_PRINT)))