/*
- * Copyright (C) 1994-1998, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zinfo.c,v $
- * Revision 1.11 1998-06-09 12:16:48 adam
+ * Revision 1.16 1999-05-26 07:49:13 adam
+ * C++ compilation.
+ *
+ * Revision 1.15 1999/01/25 13:47:54 adam
+ * Fixed bug.
+ *
+ * Revision 1.14 1998/11/04 16:31:32 adam
+ * Fixed bug regarding recordBytes in databaseInfo.
+ *
+ * Revision 1.13 1998/11/03 10:17:09 adam
+ * Fixed bug regarding creation of some data1 nodes for Explain records.
+ *
+ * Revision 1.12 1998/10/13 20:37:11 adam
+ * Changed the way attribute sets are saved in Explain database to
+ * reflect "dynamic" OIDs.
+ *
+ * Revision 1.11 1998/06/09 12:16:48 adam
* Implemented auto-generation of CategoryList records.
*
* Revision 1.10 1998/06/08 14:43:15 adam
{
data1_node *node_data = node->child;
node_data->u.data.what = DATA1I_text;
- node_data->u.data.data = node_data->lbuf;
- strcpy (node_data->u.data.data, str);
- node_data->u.data.len = strlen (node_data->u.data.data);
+ node_data->u.data.len = strlen (str);
+ node_data->u.data.data = data1_insert_string (dh, node_data,
+ nmem, str);
return node_data;
}
}
}
if (!ao)
{
- ao = nmem_malloc (zei->nmem, sizeof(*ao));
+ ao = (zebAccessObject) nmem_malloc (zei->nmem, sizeof(*ao));
ao->handle = NULL;
ao->sysno = 1;
ao->oid = oid;
if (!n)
{
- *accessInfo = nmem_malloc (zei->nmem, sizeof(**accessInfo));
+ *accessInfo = (zebAccessInfo)
+ nmem_malloc (zei->nmem, sizeof(**accessInfo));
(*accessInfo)->attributeSetIds = NULL;
(*accessInfo)->schemas = NULL;
}
struct tm *tm;
logf (LOG_DEBUG, "zebraExplain_open wr=%d", writeFlag);
- zei = xmalloc (sizeof(*zei));
+ zei = (ZebraExplainInfo) xmalloc (sizeof(*zei));
zei->updateHandle = updateHandle;
zei->updateFunc = updateFunc;
zei->dirty = 0;
zei->dh = dh;
zei->attsets = NULL;
zei->res = res;
- zei->categoryList = nmem_malloc (zei->nmem,
- sizeof(*zei->categoryList));
+ zei->categoryList = (struct zebraCategoryListInfo *)
+ nmem_malloc (zei->nmem, sizeof(*zei->categoryList));
zei->categoryList->sysno = 0;
zei->categoryList->dirty = 0;
zei->categoryList->data1_categoryList = NULL;
}
assert (node_id && node_name && node_aid);
- *zdip = nmem_malloc (zei->nmem, sizeof(**zdip));
-
+ *zdip = (struct zebDatabaseInfoB *)
+ nmem_malloc (zei->nmem, sizeof(**zdip));
(*zdip)->readFlag = 1;
(*zdip)->dirty = 0;
(*zdip)->data1_database = NULL;
(*zdip)->recordBytes = 0;
zebraExplain_mergeAccessInfo (zei, 0, &(*zdip)->accessInfo);
- (*zdip)->databaseName = nmem_malloc (zei->nmem,
- 1+node_name->u.data.len);
+ (*zdip)->databaseName = (char *)
+ nmem_malloc (zei->nmem, 1+node_name->u.data.len);
memcpy ((*zdip)->databaseName, node_name->u.data.data,
node_name->u.data.len);
(*zdip)->databaseName[node_name->u.data.len] = '\0';
(*zdip)->sysno = atoi_n (node_id->u.data.data,
node_id->u.data.len);
- (*zdip)->attributeDetails =
+ (*zdip)->attributeDetails = (zebAttributeDetails)
nmem_malloc (zei->nmem, sizeof(*(*zdip)->attributeDetails));
(*zdip)->attributeDetails->sysno = atoi_n (node_aid->u.data.data,
node_aid->u.data.len);
rec_strdup ("IR-Explain-1", &trec->size[recInfo_databaseName]);
sgml_buf = data1_nodetoidsgml(dh, zei->data1_target, 0, &sgml_len);
- trec->info[recInfo_storeData] = xmalloc (sgml_len);
+ trec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
memcpy (trec->info[recInfo_storeData], sgml_buf, sgml_len);
trec->size[recInfo_storeData] = sgml_len;
data1_node *node_use = NULL;
data1_node *node_ordinal = NULL;
data1_node *np2;
+ char oid_str[128];
+ int oid_str_len;
+
if (np->which != DATA1N_tag || strcmp (np->u.tag.tag, "attr"))
continue;
for (np2 = np->child; np2; np2 = np2->next)
node_ordinal = np2->child;
}
assert (node_set && node_use && node_ordinal);
-
- *zsuip = nmem_malloc (zei->nmem, sizeof(**zsuip));
- (*zsuip)->info.set = atoi_n (node_set->u.data.data,
- node_set->u.data.len);
+
+ oid_str_len = node_set->u.data.len;
+ if (oid_str_len >= (int) sizeof(oid_str))
+ oid_str_len = sizeof(oid_str)-1;
+ memcpy (oid_str, node_set->u.data.data, oid_str_len);
+ oid_str[oid_str_len] = '\0';
+
+ *zsuip = (struct zebSUInfoB *)
+ nmem_malloc (zei->nmem, sizeof(**zsuip));
+ (*zsuip)->info.set = oid_getvalbyname (oid_str);
+
(*zsuip)->info.use = atoi_n (node_use->u.data.data,
node_use->u.data.len);
(*zsuip)->info.ordinal = atoi_n (node_ordinal->u.data.data,
node_zebra = data1_search_tag (zei->dh, node_dbinfo->child,
"zebraInfo");
- np = data1_search_tag (zei->dh, node_dbinfo->child,
- "recordBytes");
- if (np && np->child && np->child->which == DATA1N_data)
+ if (node_zebra
+ && (np = data1_search_tag (zei->dh, node_zebra->child,
+ "recordBytes"))
+ && np->child && np->child->which == DATA1N_data)
zdi->recordBytes = atoi_n (np->child->u.data.data,
np->child->u.data.len);
if ((np = data1_search_tag (zei->dh, node_dbinfo->child,
if (zdi)
return -1;
/* it's new really. make it */
- zdi = nmem_malloc (zei->nmem, sizeof(*zdi));
+ zdi = (struct zebDatabaseInfoB *) nmem_malloc (zei->nmem, sizeof(*zdi));
zdi->next = zei->databaseInfo;
zei->databaseInfo = zdi;
zdi->sysno = 0;
zei->dirty = 1;
zei->curDatabaseInfo = zdi;
- zdi->attributeDetails =
+ zdi->attributeDetails = (zebAttributeDetails)
nmem_malloc (zei->nmem, sizeof(*zdi->attributeDetails));
zdi->attributeDetails->readFlag = 0;
zdi->attributeDetails->sysno = 0;
/* convert to "SGML" and write it */
#if ZINFO_DEBUG
- data1_pr_tree (zei->dh, zad->data1_tree, stderr);
+ data1_pr_tree (zei->dh, node_categoryList, stderr);
#endif
- sgml_buf = data1_nodetoidsgml(zei->dh, node_categoryList,
- 0, &sgml_len);
- drec->info[recInfo_storeData] = xmalloc (sgml_len);
+ sgml_buf = data1_nodetoidsgml(zei->dh, node_categoryList, 0, &sgml_len);
+ drec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
memcpy (drec->info[recInfo_storeData], sgml_buf, sgml_len);
drec->size[recInfo_storeData] = sgml_len;
oe.proto = PROTO_Z3950;
oe.oclass = CLASS_ATTSET;
- oe.value = set_ordinal;
+ oe.value = (enum oid_value) set_ordinal;
if (oid_ent_to_oid (&oe, oid))
{
data1_node *node_abt, *node_atd, *node_atvs;
data1_add_tagdata_oid (zei->dh, node_asd, "oid",
oid, zei->nmem);
-
+
node_abt = data1_add_tag (zei->dh, node_asd,
"attributesByType", zei->nmem);
node_atd = data1_add_tag (zei->dh, node_abt,
"attributeTypeDetails", zei->nmem);
data1_add_tagdata_int (zei->dh, node_atd,
- "type", 1, zei->nmem);
+ "type", 1, zei->nmem);
node_atvs = data1_add_tag (zei->dh, node_atd,
- "attributeValues", zei->nmem);
+ "attributeValues", zei->nmem);
writeAttributeValueDetails (zei, zad, node_atvs, attset);
}
}
"attrlist", zei->nmem);
for (zsui = zad->SUInfo; zsui; zsui = zsui->next)
{
+ struct oident oident;
+ int oid[OID_SIZE];
data1_node *node_attr;
- node_attr = data1_add_tag (zei->dh, node_list,
- "attr", zei->nmem);
- data1_add_tagdata_int (zei->dh, node_attr, "set",
- zsui->info.set, zei->nmem);
+
+ node_attr = data1_add_tag (zei->dh, node_list, "attr", zei->nmem);
+
+ oident.proto = PROTO_Z3950;
+ oident.oclass = CLASS_ATTSET;
+ oident.value = (enum oid_value) zsui->info.set;
+ oid_ent_to_oid (&oident, oid);
+
+ data1_add_tagdata_text (zei->dh, node_attr, "set",
+ oident.desc, zei->nmem);
data1_add_tagdata_int (zei->dh, node_attr, "use",
- zsui->info.use, zei->nmem);
+ zsui->info.use, zei->nmem);
data1_add_tagdata_int (zei->dh, node_attr, "ordinal",
- zsui->info.ordinal, zei->nmem);
+ zsui->info.ordinal, zei->nmem);
}
/* convert to "SGML" and write it */
#if ZINFO_DEBUG
#endif
sgml_buf = data1_nodetoidsgml(zei->dh, zad->data1_tree,
0, &sgml_len);
- drec->info[recInfo_storeData] = xmalloc (sgml_len);
+ drec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
memcpy (drec->info[recInfo_storeData], sgml_buf, sgml_len);
drec->size[recInfo_storeData] = sgml_len;
#endif
sgml_buf = data1_nodetoidsgml(zei->dh, zdi->data1_database,
0, &sgml_len);
- drec->info[recInfo_storeData] = xmalloc (sgml_len);
+ drec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
memcpy (drec->info[recInfo_storeData], sgml_buf, sgml_len);
drec->size[recInfo_storeData] = sgml_len;
data1_pr_tree (zei->dh, node_root, stderr);
#endif
sgml_buf = data1_nodetoidsgml(zei->dh, node_root, 0, &sgml_len);
- drec->info[recInfo_storeData] = xmalloc (sgml_len);
+ drec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
memcpy (drec->info[recInfo_storeData], sgml_buf, sgml_len);
drec->size[recInfo_storeData] = sgml_len;
#endif
sgml_buf = data1_nodetoidsgml(zei->dh, zei->data1_target,
0, &sgml_len);
- trec->info[recInfo_storeData] = xmalloc (sgml_len);
+ trec->info[recInfo_storeData] = (char *) xmalloc (sgml_len);
memcpy (trec->info[recInfo_storeData], sgml_buf, sgml_len);
trec->size[recInfo_storeData] = sgml_len;
break;
if (!ao)
{
- ao = nmem_malloc (zei->nmem, sizeof(*ao));
+ ao = (zebAccessObject) nmem_malloc (zei->nmem, sizeof(*ao));
ao->handle = NULL;
ao->sysno = 0;
ao->oid = odr_oiddup_nmem (zei->nmem, oid);
oe.proto = PROTO_Z3950;
oe.oclass = CLASS_ATTSET;
- oe.value = set;
+ oe.value = (enum oid_value) set;
if (oid_ent_to_oid (&oe, oid))
{
if (zsui->info.use == use && zsui->info.set == set)
return -1;
zebraExplain_addAttributeSet (zei, set);
- zsui = nmem_malloc (zei->nmem, sizeof(*zsui));
+ zsui = (struct zebSUInfoB *) nmem_malloc (zei->nmem, sizeof(*zsui));
zsui->next = zei->curDatabaseInfo->attributeDetails->SUInfo;
zei->curDatabaseInfo->attributeDetails->SUInfo = zsui;
zei->curDatabaseInfo->attributeDetails->dirty = 1;
if (rec->info[recInfo_attr])
return (RecordAttr *) rec->info[recInfo_attr];
- recordAttr = xmalloc (sizeof(*recordAttr));
+ recordAttr = (RecordAttr *) xmalloc (sizeof(*recordAttr));
rec->info[recInfo_attr] = (char *) recordAttr;
rec->size[recInfo_attr] = sizeof(*recordAttr);
static void att_loadset(void *p, const char *n, const char *name)
{
- data1_handle dh = p;
+ data1_handle dh = (data1_handle) p;
if (!data1_get_attset (dh, name))
logf (LOG_WARN, "Couldn't load attribute set %s", name);
}
projects / idzebra-moved-to-github.git / blobdiff