X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_grs.c;h=ece37817f98f07748f1f4226c693c94a7dea0401;hb=a774858896a9b56c966edbfb70d8eae1c91c4ad1;hp=d17ca3c5973abb7ff9bdef4ed68fde3c17559e31;hpb=044d170f0a963555486df54653cd2fdc5815928b;p=yaz-moved-to-github.git diff --git a/retrieval/d1_grs.c b/retrieval/d1_grs.c index d17ca3c..ece3781 100644 --- a/retrieval/d1_grs.c +++ b/retrieval/d1_grs.c @@ -1,10 +1,35 @@ /* - * Copyright (c) 1995-1997, Index Data. + * Copyright (c) 1995-1999, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_grs.c,v $ - * Revision 1.13 1998-02-11 11:53:35 adam + * Revision 1.21 2002-05-28 21:09:44 adam + * schema mapping supports duplicate maps (copy instead of pointer swap) + * + * Revision 1.20 2002/05/13 14:13:37 adam + * XML reader for data1 (EXPAT) + * + * Revision 1.19 2002/04/15 09:06:30 adam + * Fix explain tags for XML writer + * + * Revision 1.18 2002/04/12 14:40:07 adam + * GRS-1 writer accepts non-abs + * + * Revision 1.17 1999/11/30 13:47:12 adam + * Improved installation. Moved header files to include/yaz. + * + * Revision 1.16 1999/08/27 09:40:32 adam + * Renamed logf function to yaz_log. Removed VC++ project files. + * + * Revision 1.15 1999/03/31 11:18:25 adam + * Implemented odr_strdup. Added Reference ID to backend server API. + * + * Revision 1.14 1998/03/16 12:21:15 adam + * Fixed problem with tag names that weren't set to the right value + * when wildcards were used. + * + * Revision 1.13 1998/02/11 11:53:35 adam * Changed code so that it compiles as C++. * * Revision 1.12 1997/11/24 11:33:56 adam @@ -51,10 +76,9 @@ #include #include -#include -#include - -#include +#include +#include +#include #define D1_VARIANTARRAY 20 /* fixed max length on sup'd variant-list. Lazy me */ @@ -113,13 +137,12 @@ static Z_Variant *make_variant(data1_node *n, int num, ODR o) { case DATA1K_string: t->which = Z_Triple_internationalString; - t->value.internationalString = (char *)odr_malloc(o, - strlen(p->u.variant.value)+1); - strcpy(t->value.internationalString, p->u.variant.value); + t->value.internationalString = + odr_strdup(o, p->u.variant.value); break; default: - logf(LOG_WARN, "Unable to handle value for variant %s", - p->u.variant.type->name); + yaz_log(LOG_WARN, "Unable to handle value for variant %s", + p->u.variant.type->name); return 0; } } @@ -142,8 +165,8 @@ static int traverse_triples(data1_node *n, int level, Z_ElementMetaData *m, D1_VARIANTARRAY); else if (m->num_supportedVariants >= D1_VARIANTARRAY) { - logf(LOG_WARN, "Too many variants (D1_VARIANTARRAY==%d)", - D1_VARIANTARRAY); + yaz_log(LOG_WARN, "Too many variants (D1_VARIANTARRAY==%d)", + D1_VARIANTARRAY); return -1; } @@ -179,32 +202,32 @@ static Z_ElementData *nodetoelementdata(data1_handle dh, data1_node *n, switch (n->u.data.what) { - case DATA1I_num: - res->which = Z_ElementData_numeric; - res->u.numeric = (int *)odr_malloc(o, sizeof(int)); - *res->u.numeric = atoi(n->u.data.data); - *len += 4; - break; - case DATA1I_text: - toget = n->u.data.len; - if (p->u.tag.get_bytes > 0 && p->u.tag.get_bytes < toget) - toget = p->u.tag.get_bytes; - res->which = Z_ElementData_string; - res->u.string = (char *)odr_malloc(o, toget+1); - memcpy(res->u.string, n->u.data.data, toget); - res->u.string[toget] = '\0'; - *len += toget; - break; - case DATA1I_oid: - res->which = Z_ElementData_oid; - strncpy(str, n->u.data.data, n->u.data.len); - str[n->u.data.len] = '\0'; - res->u.oid = odr_getoidbystr(o, str); - *len += n->u.data.len; - break; - default: - logf(LOG_WARN, "Can't handle datatype."); - return 0; + case DATA1I_num: + res->which = Z_ElementData_numeric; + res->u.numeric = (int *)odr_malloc(o, sizeof(int)); + *res->u.numeric = atoi(n->u.data.data); + *len += 4; + break; + case DATA1I_text: + toget = n->u.data.len; + if (p && p->u.tag.get_bytes > 0 && p->u.tag.get_bytes < toget) + toget = p->u.tag.get_bytes; + res->which = Z_ElementData_string; + res->u.string = (char *)odr_malloc(o, toget+1); + memcpy(res->u.string, n->u.data.data, toget); + res->u.string[toget] = '\0'; + *len += toget; + break; + case DATA1I_oid: + res->which = Z_ElementData_oid; + strncpy(str, n->u.data.data, n->u.data.len); + str[n->u.data.len] = '\0'; + res->u.oid = odr_getoidbystr(o, str); + *len += n->u.data.len; + break; + default: + yaz_log(LOG_WARN, "Can't handle datatype."); + return 0; } } else @@ -223,7 +246,7 @@ static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n, Z_TaggedElement *res = (Z_TaggedElement *)odr_malloc(o, sizeof(*res)); data1_tag *tag = 0; data1_node *data; - int leaf; + int leaf = 0; if (n->which == DATA1N_tag) { @@ -238,10 +261,11 @@ static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n, */ else if (n->which == DATA1N_data || n->which == DATA1N_variant) { - if (!(tag = data1_gettagbyname (dh, n->root->u.root.absyn->tagset, + if (n->root->u.root.absyn && + !(tag = data1_gettagbyname (dh, n->root->u.root.absyn->tagset, "wellKnown"))) { - logf(LOG_WARN, "Unable to locate tag for 'wellKnown'"); + yaz_log(LOG_WARN, "Unable to locate tag for 'wellKnown'"); return 0; } data = n; @@ -249,7 +273,7 @@ static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n, } else { - logf(LOG_WARN, "Bad data."); + yaz_log(LOG_WARN, "Bad data."); return 0; } @@ -266,14 +290,14 @@ static Z_TaggedElement *nodetotaggedelement(data1_handle dh, data1_node *n, { char *tagstr; - if (tag) /* well-known tag */ - tagstr = tag->value.string; - else /* tag local to this file */ - tagstr = n->u.tag.tag; - + if (n->which == DATA1N_tag) + tagstr = n->u.tag.tag; /* tag at node */ + else if (tag) + tagstr = tag->value.string; /* no take from well-known */ + else + tagstr = "???"; /* no tag at all! */ res->tagValue->which = Z_StringOrNumeric_string; - res->tagValue->u.string = (char *)odr_malloc(o, strlen(tagstr)+1); - strcpy(res->tagValue->u.string, tagstr); + res->tagValue->u.string = odr_strdup(o, tagstr); } res->tagOccurrence = 0; res->appliedVariant = 0; @@ -318,7 +342,8 @@ Z_GenericRecord *data1_nodetogr(data1_handle dh, data1_node *n, for (c = n->child; c; c = c->next) num_children++; - res->elements = (Z_TaggedElement **)odr_malloc(o, sizeof(Z_TaggedElement *) * num_children); + res->elements = (Z_TaggedElement **) + odr_malloc(o, sizeof(Z_TaggedElement *) * num_children); res->num_elements = 0; for (c = n->child; c; c = c->next) {