/*
- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2000, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zinfo.c,v $
- * Revision 1.16 1999-05-26 07:49:13 adam
+ * Revision 1.21 2000-12-05 10:01:44 adam
+ * Fixed bug regarding user-defined attribute sets.
+ *
+ * Revision 1.20 2000/11/29 14:24:01 adam
+ * Script configure uses yaz pthreads options. Added locking for
+ * zebra_register_{lock,unlock}.
+ *
+ * Revision 1.19 2000/07/07 12:49:20 adam
+ * Optimized resultSetInsert{Rank,Sort}.
+ *
+ * Revision 1.18 2000/03/20 19:08:36 adam
+ * Added remote record import using Z39.50 extended services and Segment
+ * Requests.
+ *
+ * Revision 1.17 1999/07/14 10:53:51 adam
+ * Updated various routines to handle missing explain schema.
+ *
+ * Revision 1.16 1999/05/26 07:49:13 adam
* C++ compilation.
*
* Revision 1.15 1999/01/25 13:47:54 adam
const char *tag, NMEM nmem)
{
data1_node *partag = get_parent_tag(dh, at);
- data1_node *res = data1_mk_node (dh, nmem);
+ data1_node *res = data1_mk_node_type (dh, nmem, DATA1N_tag);
data1_element *e = NULL;
res->parent = at;
- res->which = DATA1N_tag;
res->u.tag.tag = data1_insert_string (dh, res, nmem, tag);
- res->u.tag.node_selected = 0;
- res->u.tag.make_variantlist = 0;
- res->u.tag.no_data_requested = 0;
- res->u.tag.get_bytes = -1;
if (partag)
e = partag->u.tag.element;
return rec;
}
-void zebraExplain_close (ZebraExplainInfo zei, int writeFlag,
- int (*updateH)(Record drec, data1_node *n))
+void zebraExplain_flush (ZebraExplainInfo zei, int writeFlag, void *handle)
{
- struct zebDatabaseInfoB *zdi;
-
- logf (LOG_DEBUG, "zebraExplain_close wr=%d", writeFlag);
+ zei->updateHandle = handle;
if (writeFlag)
{
+ struct zebDatabaseInfoB *zdi;
zebAccessObject o;
+
/* write each database info record */
for (zdi = zei->databaseInfo; zdi; zdi = zdi->next)
{
zdi->databaseName, 0);
}
zebraExplain_writeTarget (zei, 0);
-
}
+}
+
+void zebraExplain_close (ZebraExplainInfo zei, int writeFlag)
+{
+#if ZINFO_DEBUG
+ logf (LOG_LOG, "zebraExplain_close wr=%d", writeFlag);
+#endif
+ if (!zei)
+ return;
+ zebraExplain_flush (zei, writeFlag, zei->updateHandle);
nmem_destroy (zei->nmem);
- xfree (zei);
}
void zebraExplain_mergeOids (ZebraExplainInfo zei, data1_node *n,
struct zebDatabaseInfoB **zdip;
time_t our_time;
struct tm *tm;
+ NMEM nmem = nmem_create ();
- logf (LOG_DEBUG, "zebraExplain_open wr=%d", writeFlag);
- zei = (ZebraExplainInfo) xmalloc (sizeof(*zei));
+#if ZINFO_DEBUG
+ logf (LOG_LOG, "zebraExplain_open wr=%d", writeFlag);
+#endif
+ zei = (ZebraExplainInfo) nmem_malloc (nmem, sizeof(*zei));
zei->updateHandle = updateHandle;
zei->updateFunc = updateFunc;
zei->dirty = 0;
zei->curDatabaseInfo = NULL;
zei->records = records;
- zei->nmem = nmem_create ();
+ zei->nmem = nmem;
zei->dh = dh;
zei->attsets = NULL;
zei->res = res;
zdip = &zei->databaseInfo;
trec = rec_get (records, 1); /* get "root" record */
+ zei->ordinalSU = 1;
+ zei->runNumber = 0;
+
zebraExplain_mergeAccessInfo (zei, 0, &zei->accessInfo);
if (trec) /* targetInfo already exists ... */
{
data1_node *node_tgtinfo, *node_zebra, *node_list, *np;
zei->data1_target = read_sgml_rec (zei->dh, zei->nmem, trec);
-
+ if (!zei->data1_target || !zei->data1_target->u.root.absyn)
+ {
+ logf (LOG_FATAL, "Explain schema missing. Check profilePath");
+ nmem_destroy (zei->nmem);
+ return 0;
+ }
#if ZINFO_DEBUG
data1_pr_tree (zei->dh, zei->data1_target, stderr);
#endif
node_zebra = data1_search_tag (zei->dh, node_tgtinfo->child,
"zebraInfo");
- node_list = data1_search_tag (zei->dh, node_zebra->child,
- "databaseList");
- for (np = node_list->child; np; np = np->next)
+ np = 0;
+ if (node_zebra)
+ {
+ node_list = data1_search_tag (zei->dh, node_zebra->child,
+ "databaseList");
+ if (node_list)
+ np = node_list->child;
+ }
+ for (; np; np = np->next)
{
data1_node *node_name = NULL;
data1_node *node_id = NULL;
zdip = &(*zdip)->next;
}
- np = data1_search_tag (zei->dh, node_zebra->child,
- "ordinalSU");
- np = np->child;
- assert (np && np->which == DATA1N_data);
- zei->ordinalSU = atoi_n (np->u.data.data, np->u.data.len);
-
- np = data1_search_tag (zei->dh, node_zebra->child,
- "runNumber");
- np = np->child;
- assert (np && np->which == DATA1N_data);
- zei->runNumber = atoi_n (np->u.data.data, np->u.data.len);
- *zdip = NULL;
+ if (node_zebra)
+ {
+ np = data1_search_tag (zei->dh, node_zebra->child,
+ "ordinalSU");
+ np = np->child;
+ assert (np && np->which == DATA1N_data);
+ zei->ordinalSU = atoi_n (np->u.data.data, np->u.data.len);
+
+ np = data1_search_tag (zei->dh, node_zebra->child,
+ "runNumber");
+ np = np->child;
+ assert (np && np->which == DATA1N_data);
+ zei->runNumber = atoi_n (np->u.data.data, np->u.data.len);
+ *zdip = NULL;
+ }
rec_rm (&trec);
}
else /* create initial targetInfo */
{
data1_node *node_tgtinfo;
- zei->ordinalSU = 1;
- zei->runNumber = 0;
+ *zdip = NULL;
if (writeFlag)
{
char *sgml_buf;
"<multipleDBSearch>1</>\n"
"<nicknames><name>Zebra</></>\n"
"</></>\n" );
-
+ if (!zei->data1_target || !zei->data1_target->u.root.absyn)
+ {
+ logf (LOG_FATAL, "Explain schema missing. Check profilePath");
+ nmem_destroy (zei->nmem);
+ return 0;
+ }
node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target->child,
"targetInfo");
assert (node_tgtinfo);
trec->size[recInfo_storeData] = sgml_len;
rec_put (records, &trec);
+ rec_rm (&trec);
+
}
- *zdip = NULL;
- rec_rm (&trec);
zebraExplain_newDatabase (zei, "IR-Explain-1", 0);
-
+
if (!zei->categoryList->dirty)
{
struct zebraCategoryListInfo *zcl = zei->categoryList;
data1_node *node_cl;
-
+
zcl->dirty = 1;
zcl->data1_categoryList =
data1_read_sgml (zei->dh, zei->nmem,
"<explain><categoryList>CategoryList\n"
- "/></>\n");
- node_cl = data1_search_tag (zei->dh,
- zcl->data1_categoryList->child,
- "categoryList");
- assert (node_cl);
- zebraExplain_initCommonInfo (zei, node_cl);
+ "</></>\n");
+
+ if (zcl->data1_categoryList)
+ {
+ assert (zcl->data1_categoryList->child);
+ node_cl = data1_search_tag (zei->dh,
+ zcl->data1_categoryList->child,
+ "categoryList");
+ assert (node_cl);
+ zebraExplain_initCommonInfo (zei, node_cl);
+ }
}
}
return zei;
{
zdi->recordCount = atoi_n (np->child->u.data.data,
np->child->u.data.len);
- }
+ }
zdi->readFlag = 0;
rec_rm (&rec);
}
data1_read_sgml (zei->dh, zei->nmem,
"<explain><databaseInfo>DatabaseInfo\n"
"</></>\n");
+ if (!zdi->data1_database)
+ return -2;
node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
"databaseInfo");
projects / idzebra-moved-to-github.git / blobdiff