-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: zinfo.c,v 1.25 2002-04-04 14:14:13 adam Exp $
- */
+/* $Id: zinfo.c,v 1.41 2004-11-19 10:27:05 heikki Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
#include <stdlib.h>
#include <assert.h>
#include <string.h>
#include <time.h>
-#include <zebraver.h>
+#include <idzebra/version.h>
#include "zinfo.h"
#define ZINFO_DEBUG 0
typedef struct zebAccessObjectB *zebAccessObject;
struct zebAccessObjectB {
void *handle;
- int sysno;
+ SYSNO sysno;
Odr_oid *oid;
zebAccessObject next;
};
typedef struct {
struct zebSUInfoB *SUInfo;
- int sysno;
+ SYSNO sysno;
int dirty;
int readFlag;
data1_node *data1_tree;
zebAttributeDetails attributeDetails;
char *databaseName;
data1_node *data1_database;
- int recordCount; /* records in db */
- int recordBytes; /* size of records */
- int sysno; /* sysno of database info */
+ zint recordCount; /* records in db */
+ zint recordBytes; /* size of records */
+ SYSNO sysno; /* sysno of database info */
int readFlag; /* 1: read is needed when referenced; 0 if not */
int dirty; /* 1: database is dirty: write is needed */
struct zebDatabaseInfoB *next;
struct zebraCategoryListInfo {
int dirty;
- int sysno;
+ SYSNO sysno;
data1_node *data1_categoryList;
};
struct zebraExplainInfo {
- int ordinalSU;
- int runNumber;
- int dirty;
+ int ordinalSU;
+ zint runNumber;
+ int dirty;
+ int write_flag;
Records records;
data1_handle dh;
Res res;
return data1_read_sgml (dh, nmem, rec->info[recInfo_storeData]);
}
-static data1_node *data1_search_tag (data1_handle dh, data1_node *n,
- const char *tag)
-{
- logf (LOG_DEBUG, "data1_search_tag %s", tag);
- for (; n; n = n->next)
- if (n->which == DATA1N_tag && n->u.tag.tag &&
- !yaz_matchstr (tag, n->u.tag.tag))
- {
- logf (LOG_DEBUG, " found");
- return n;
- }
- logf (LOG_DEBUG, " not found");
- return 0;
-}
-
-static data1_node *data1_add_tag (data1_handle dh, data1_node *at,
- const char *tag, NMEM nmem)
-{
- data1_node *partag = get_parent_tag(dh, at);
- data1_node *res = data1_mk_node_type (dh, nmem, DATA1N_tag);
- data1_element *e = NULL;
-
- res->parent = at;
- res->u.tag.tag = data1_insert_string (dh, res, nmem, tag);
-
- if (partag)
- e = partag->u.tag.element;
- res->u.tag.element =
- data1_getelementbytagname (dh, at->root->u.root.absyn,
- e, res->u.tag.tag);
- res->root = at->root;
- if (!at->child)
- at->child = res;
- else
- {
- assert (at->last_child);
- at->last_child->next = res;
- }
- at->last_child = res;
- return res;
-}
-
-static data1_node *data1_make_tag (data1_handle dh, data1_node *at,
- const char *tag, NMEM nmem)
-{
- data1_node *node = data1_search_tag (dh, at->child, tag);
- if (!node)
- node = data1_add_tag (dh, at, tag, nmem);
- else
- node->child = node->last_child = NULL;
- return node;
-}
-
-static data1_node *data1_add_tagdata_int (data1_handle dh, data1_node *at,
- const char *tag, int num,
- NMEM nmem)
-{
- data1_node *node_data;
-
- node_data = data1_add_taggeddata (dh, at->root, at, tag, nmem);
- if (!node_data)
- return 0;
- node_data->u.data.what = DATA1I_num;
- node_data->u.data.data = node_data->lbuf;
- sprintf (node_data->u.data.data, "%d", num);
- node_data->u.data.len = strlen (node_data->u.data.data);
- return node_data;
-}
-
-static data1_node *data1_add_tagdata_oid (data1_handle dh, data1_node *at,
- const char *tag, Odr_oid *oid,
- NMEM nmem)
-{
- data1_node *node_data;
- char str[128], *p = str;
- Odr_oid *ii;
-
- node_data = data1_add_taggeddata (dh, at->root, at, tag, nmem);
- if (!node_data)
- return 0;
-
- for (ii = oid; *ii >= 0; ii++)
- {
- if (ii != oid)
- *p++ = '.';
- sprintf (p, "%d", *ii);
- p += strlen (p);
- }
- node_data->u.data.what = DATA1I_oid;
- node_data->u.data.len = strlen (str);
- node_data->u.data.data = data1_insert_string (dh, node_data, nmem, str);
- return node_data;
-}
-
-
-static data1_node *data1_add_tagdata_text (data1_handle dh, data1_node *at,
- const char *tag, const char *str,
- NMEM nmem)
-{
- data1_node *node_data;
-
- node_data = data1_add_taggeddata (dh, at->root, at, tag, nmem);
- if (!node_data)
- return 0;
- node_data->u.data.what = DATA1I_text;
- node_data->u.data.len = strlen (str);
- node_data->u.data.data = data1_insert_string (dh, node_data, nmem, str);
- return node_data;
-}
-
-static data1_node *data1_make_tagdata_text (data1_handle dh, data1_node *at,
- const char *tag, const char *str,
- NMEM nmem)
-{
- data1_node *node = data1_search_tag (dh, at->child, tag);
- if (!node)
- return data1_add_tagdata_text (dh, at, tag, str, nmem);
- else
- {
- data1_node *node_data = node->child;
- node_data->u.data.what = DATA1I_text;
- node_data->u.data.len = strlen (str);
- node_data->u.data.data = data1_insert_string (dh, node_data,
- nmem, str);
- return node_data;
- }
-}
-
static void zebraExplain_writeDatabase (ZebraExplainInfo zei,
struct zebDatabaseInfoB *zdi,
int key_flush);
int key_flush);
-static Record createRecord (Records records, int *sysno)
+static Record createRecord (Records records, SYSNO *sysno)
{
Record rec;
if (*sysno)
return rec;
}
-void zebraExplain_flush (ZebraExplainInfo zei, int writeFlag, void *handle)
+void zebraExplain_flush (ZebraExplainInfo zei, void *handle)
{
if (!zei)
return;
zei->updateHandle = handle;
- if (writeFlag)
+ if (zei->write_flag)
{
struct zebDatabaseInfoB *zdi;
zebAccessObject o;
}
}
-void zebraExplain_close (ZebraExplainInfo zei, int writeFlag)
+void zebraExplain_close (ZebraExplainInfo zei)
{
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_close wr=%d", writeFlag);
+ yaz_log (YLOG_LOG, "zebraExplain_close");
#endif
if (!zei)
return;
- zebraExplain_flush (zei, writeFlag, zei->updateHandle);
+ zebraExplain_flush (zei, zei->updateHandle);
nmem_destroy (zei->nmem);
}
}
}
+/* Explain structure
+ root record
+ of type targetInfo
+ and has sysno = 1
+
+ databaseList (list of databases)
+*/
+/*
+Example root:
+explain:
+ targetInfo: TargetInfo
+ name: Zebra
+ namedResultSets: 1
+ multipleDbSearch: 1
+ nicknames:
+ name: Zebra
+ commonInfo:
+ dateAdded: 20030630190601
+ dateChanged: 20030630190601
+ languageCode: EN
+ accessinfo:
+ unitSystems:
+ string: ISO
+ attributeSetIds:
+ oid: 1.2.840.10003.3.2
+ oid: 1.2.840.10003.3.5
+ oid: 1.2.840.10003.3.1
+ schemas:
+ oid: 1.2.840.10003.13.1000.81.2
+ oid: 1.2.840.10003.13.2
+ zebraInfo:
+ version: 1.3.12
+ databaseList:
+ database:
+ name: Default
+ id: 50
+ attributeDetailsId: 51
+ database:
+ name: IR-Explain-1
+ id: 52
+ attributeDetailsId: 53
+ ordinalSU: 38
+ runNumber: 1
+nextResultSetPosition = 2
+*/
+
ZebraExplainInfo zebraExplain_open (
Records records, data1_handle dh,
Res res,
NMEM nmem = nmem_create ();
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_open wr=%d", writeFlag);
+ yaz_log (YLOG_LOG, "zebraExplain_open wr=%d", writeFlag);
#endif
zei = (ZebraExplainInfo) nmem_malloc (nmem, sizeof(*zei));
+ zei->write_flag = writeFlag;
zei->updateHandle = updateHandle;
zei->updateFunc = updateFunc;
zei->dirty = 0;
zei->categoryList->dirty = 0;
zei->categoryList->data1_categoryList = NULL;
- time (&our_time);
- tm = localtime (&our_time);
- sprintf (zei->date, "%04d%02d%02d%02d%02d%02d",
- tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
- tm->tm_hour, tm->tm_min, tm->tm_sec);
-
+ if ( atoi (res_get_def (res, "notimestamps", "0") )== 0)
+ {
+ time (&our_time);
+ tm = localtime (&our_time);
+ sprintf (zei->date, "%04d%02d%02d%02d%02d%02d",
+ tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+ tm->tm_hour, tm->tm_min, tm->tm_sec);
+ } else {
+ sprintf (zei->date, "%04d%02d%02d%02d%02d%02d",
+ 0, 0, 0, 0, 0, 0);
+ }
zdip = &zei->databaseInfo;
trec = rec_get (records, 1); /* get "root" record */
data1_node *node_tgtinfo, *node_zebra, *node_list, *np;
zei->data1_target = read_sgml_rec (zei->dh, zei->nmem, trec);
+#if 0
if (!zei->data1_target || !zei->data1_target->u.root.absyn)
+#else
+ if (!zei->data1_target)
+#endif
{
- logf (LOG_FATAL, "Explain schema missing. Check profilePath");
+ yaz_log (YLOG_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_tgtinfo = data1_search_tag (zei->dh, zei->data1_target->child,
- "targetInfo");
+ node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target,
+ "/targetInfo");
zebraExplain_mergeAccessInfo (zei, node_tgtinfo,
&zei->accessInfo);
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)->sysno = atoi_zn (node_id->u.data.data,
+ node_id->u.data.len);
(*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);
+ (*zdip)->attributeDetails->sysno = atoi_zn (node_aid->u.data.data,
+ node_aid->u.data.len);
(*zdip)->attributeDetails->readFlag = 1;
(*zdip)->attributeDetails->dirty = 0;
(*zdip)->attributeDetails->SUInfo = NULL;
"runNumber");
np = np->child;
assert (np && np->which == DATA1N_data);
- zei->runNumber = atoi_n (np->u.data.data, np->u.data.len);
+ zei->runNumber = atoi_zn (np->u.data.data, np->u.data.len);
+ yaz_log (YLOG_DEBUG, "read runnumber=" ZINT_FORMAT, zei->runNumber);
*zdip = NULL;
}
rec_rm (&trec);
"<multipleDBSearch>1</>\n"
"<nicknames><name>Zebra</></>\n"
"</></>\n" );
- if (!zei->data1_target || !zei->data1_target->u.root.absyn)
+ if (!zei->data1_target)
{
- logf (LOG_FATAL, "Explain schema missing. Check profilePath");
+ yaz_log (YLOG_FATAL, "Explain schema missing. Check profilePath");
nmem_destroy (zei->nmem);
return 0;
}
- node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target->child,
- "targetInfo");
+ node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target,
+ "/targetInfo");
assert (node_tgtinfo);
zebraExplain_initCommonInfo (zei, node_tgtinfo);
if (zcl->data1_categoryList)
{
- assert (zcl->data1_categoryList->child);
- node_cl = data1_search_tag (zei->dh,
- zcl->data1_categoryList->child,
- "categoryList");
+ node_cl = data1_search_tag (zei->dh, zcl->data1_categoryList,
+ "/categoryList");
assert (node_cl);
zebraExplain_initCommonInfo (zei, node_cl);
}
zad->data1_tree = read_sgml_rec (zei->dh, zei->nmem, rec);
- node_adinfo = data1_search_tag (zei->dh, zad->data1_tree->child,
- "attributeDetails");
+ node_adinfo = data1_search_tag (zei->dh, zad->data1_tree,
+ "/attributeDetails");
node_zebra = data1_search_tag (zei->dh, node_adinfo->child,
"zebraInfo");
node_list = data1_search_tag (zei->dh, node_zebra->child,
node_use->u.data.len);
(*zsuip)->info.ordinal = atoi_n (node_ordinal->u.data.data,
node_ordinal->u.data.len);
- logf (LOG_DEBUG, "set=%d use=%d ordinal=%d",
+ yaz_log (YLOG_DEBUG, "set=%d use=%d ordinal=%d",
(*zsuip)->info.set, (*zsuip)->info.use, (*zsuip)->info.ordinal);
zsuip = &(*zsuip)->next;
}
zdi->data1_database = read_sgml_rec (zei->dh, zei->nmem, rec);
- node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
- "databaseInfo");
+ node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database,
+ "/databaseInfo");
+ assert (node_dbinfo);
zebraExplain_mergeAccessInfo (zei, node_dbinfo, &zdi->accessInfo);
node_zebra = data1_search_tag (zei->dh, node_dbinfo->child,
&& (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);
+ zdi->recordBytes = atoi_zn (np->child->u.data.data,
+ np->child->u.data.len);
if ((np = data1_search_tag (zei->dh, node_dbinfo->child,
"recordCount")) &&
(np = data1_search_tag (zei->dh, np->child,
"recordCountActual")) &&
np->child->which == DATA1N_data)
{
- zdi->recordCount = atoi_n (np->child->u.data.data,
- np->child->u.data.len);
+ zdi->recordCount = atoi_zn (np->child->u.data.data,
+ np->child->u.data.len);
}
zdi->readFlag = 0;
rec_rm (&rec);
}
+int zebraExplain_removeDatabase(ZebraExplainInfo zei, void *update_handle)
+{
+ struct zebDatabaseInfoB **zdip = &zei->databaseInfo;
+
+ while (*zdip)
+ {
+ if (*zdip == zei->curDatabaseInfo)
+ {
+ struct zebDatabaseInfoB *zdi = *zdip;
+ Record rec;
+
+ zei->dirty = 1;
+ zei->updateHandle = update_handle;
+
+ if (zdi->attributeDetails)
+ {
+ /* remove attribute details keys and delete it */
+ zebAttributeDetails zad = zdi->attributeDetails;
+
+ rec = rec_get(zei->records, zad->sysno);
+ (*zei->updateFunc)(zei->updateHandle, rec, 0);
+ rec_rm(&rec);
+ }
+ /* remove database record keys and delete it */
+ rec = rec_get (zei->records, zdi->sysno);
+ (*zei->updateFunc)(zei->updateHandle, rec, 0);
+ rec_rm(&rec);
+
+ /* remove from list */
+ *zdip = zdi->next;
+
+ /* current database is IR-Explain-1 */
+ return 0;
+ }
+ zdip = &(*zdip)->next;
+ }
+ return -1;
+}
+
int zebraExplain_curDatabase (ZebraExplainInfo zei, const char *database)
{
struct zebDatabaseInfoB *zdi;
assert (zei);
if (zei->curDatabaseInfo &&
- !strcmp (zei->curDatabaseInfo->databaseName, database))
+ !STRCASECMP (zei->curDatabaseInfo->databaseName, database))
return 0;
for (zdi = zei->databaseInfo; zdi; zdi=zdi->next)
{
- if (!strcmp (zdi->databaseName, database_n))
+ if (!STRCASECMP (zdi->databaseName, database_n))
break;
}
if (!zdi)
return -1;
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_curDatabase: %s", database);
+ yaz_log (YLOG_LOG, "zebraExplain_curDatabase: %s", database);
#endif
if (zdi->readFlag)
{
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_readDatabase: %s", database);
+ yaz_log (YLOG_LOG, "zebraExplain_readDatabase: %s", database);
#endif
zebraExplain_readDatabase (zei, zdi);
}
if (zdi->attributeDetails->readFlag)
{
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_readAttributeDetails: %s", database);
+ yaz_log (YLOG_LOG, "zebraExplain_readAttributeDetails: %s", database);
#endif
zebraExplain_readAttributeDetails (zei, zdi->attributeDetails);
}
static void zebraExplain_initCommonInfo (ZebraExplainInfo zei, data1_node *n)
{
- data1_node *c = data1_add_tag (zei->dh, n, "commonInfo", zei->nmem);
-
- data1_add_tagdata_text (zei->dh, c, "dateAdded", zei->date, zei->nmem);
- data1_add_tagdata_text (zei->dh, c, "dateChanged", zei->date, zei->nmem);
- data1_add_tagdata_text (zei->dh, c, "languageCode", "EN", zei->nmem);
+ data1_node *c = data1_mk_tag (zei->dh, zei->nmem, "commonInfo", 0, n);
+ data1_mk_tag_data_text (zei->dh, c, "dateAdded", zei->date, zei->nmem);
+ data1_mk_tag_data_text (zei->dh, c, "dateChanged", zei->date, zei->nmem);
+ data1_mk_tag_data_text (zei->dh, c, "languageCode", "EN", zei->nmem);
}
static void zebraExplain_updateCommonInfo (ZebraExplainInfo zei, data1_node *n)
{
data1_node *c = data1_search_tag (zei->dh, n->child, "commonInfo");
assert (c);
- data1_make_tagdata_text (zei->dh, c, "dateChanged", zei->date, zei->nmem);
+ data1_mk_tag_data_text_uni (zei->dh, c, "dateChanged", zei->date,
+ zei->nmem);
}
static void zebraExplain_initAccessInfo (ZebraExplainInfo zei, data1_node *n)
{
- data1_node *c = data1_add_tag (zei->dh, n, "accessInfo", zei->nmem);
- data1_node *d = data1_add_tag (zei->dh, c, "unitSystems", zei->nmem);
- data1_add_tagdata_text (zei->dh, d, "string", "ISO", zei->nmem);
+ data1_node *c = data1_mk_tag (zei->dh, zei->nmem, "accessInfo", 0, n);
+ data1_node *d = data1_mk_tag (zei->dh, zei->nmem, "unitSystems", 0, c);
+ data1_mk_tag_data_text (zei->dh, d, "string", "ISO", zei->nmem);
}
static void zebraExplain_updateAccessInfo (ZebraExplainInfo zei, data1_node *n,
data1_node *d;
zebAccessObject p;
- assert (c);
+ if (!c)
+ {
+ data1_pr_tree (zei->dh, n, stdout);
+ exit (0);
+ assert (c);
+ }
if ((p = accessInfo->attributeSetIds))
{
- d = data1_make_tag (zei->dh, c, "attributeSetIds", zei->nmem);
+ d = data1_mk_tag_uni (zei->dh, zei->nmem, "attributeSetIds", c);
for (; p; p = p->next)
- data1_add_tagdata_oid (zei->dh, d, "oid", p->oid, zei->nmem);
+ data1_mk_tag_data_oid (zei->dh, d, "oid", p->oid, zei->nmem);
}
if ((p = accessInfo->schemas))
{
- d = data1_make_tag (zei->dh, c, "schemas", zei->nmem);
+ d = data1_mk_tag_uni (zei->dh, zei->nmem, "schemas", c);
for (; p; p = p->next)
- data1_add_tagdata_oid (zei->dh, d, "oid", p->oid, zei->nmem);
+ data1_mk_tag_data_oid (zei->dh, d, "oid", p->oid, zei->nmem);
}
}
database_n = database;
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_newDatabase: %s", database);
+ yaz_log (YLOG_LOG, "zebraExplain_newDatabase: %s", database);
#endif
assert (zei);
for (zdi = zei->databaseInfo; zdi; zdi=zdi->next)
{
- if (!strcmp (zdi->databaseName, database_n))
+ if (!STRCASECMP (zdi->databaseName, database_n))
break;
}
if (zdi)
"</></>\n");
if (!zdi->data1_database)
return -2;
-
- node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
- "databaseInfo");
+
+ node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database,
+ "/databaseInfo");
assert (node_dbinfo);
zebraExplain_initCommonInfo (zei, node_dbinfo);
zebraExplain_initAccessInfo (zei, node_dbinfo);
- data1_add_tagdata_text (zei->dh, node_dbinfo, "name",
+ data1_mk_tag_data_text (zei->dh, node_dbinfo, "name",
database, zei->nmem);
if (explain_database)
- data1_add_tagdata_text (zei->dh, node_dbinfo, "explainDatabase",
+ data1_mk_tag_data_text (zei->dh, node_dbinfo, "explainDatabase",
"", zei->nmem);
- data1_add_tagdata_text (zei->dh, node_dbinfo, "userFee",
+ data1_mk_tag_data_text (zei->dh, node_dbinfo, "userFee",
"0", zei->nmem);
- data1_add_tagdata_text (zei->dh, node_dbinfo, "available",
+ data1_mk_tag_data_text (zei->dh, node_dbinfo, "available",
"1", zei->nmem);
#if ZINFO_DEBUG
"<explain><attributeDetails>AttributeDetails\n"
"</></>\n");
- node_adinfo =
- data1_search_tag (zei->dh, zdi->attributeDetails->data1_tree->child,
- "attributeDetails");
+ node_adinfo = data1_search_tag (zei->dh, zdi->attributeDetails->data1_tree,
+ "/attributeDetails");
assert (node_adinfo);
zebraExplain_initCommonInfo (zei, node_adinfo);
data1_node *node_attvalue, *node_value;
if (set_ordinal != zsui->info.set)
continue;
- node_attvalue = data1_add_tag (zei->dh, node_atvs, "attributeValue",
- zei->nmem);
- node_value = data1_add_tag (zei->dh, node_attvalue, "value",
- zei->nmem);
- data1_add_tagdata_int (zei->dh, node_value, "numeric",
+ node_attvalue = data1_mk_tag (zei->dh, zei->nmem, "attributeValue",
+ 0 /* attr */, node_atvs);
+ node_value = data1_mk_tag (zei->dh, zei->nmem, "value",
+ 0 /* attr */, node_attvalue);
+ data1_mk_tag_data_int (zei->dh, node_value, "numeric",
zsui->info.use, zei->nmem);
}
}
int i;
Record drec;
data1_node *node_ci, *node_categoryList;
- int sysno = 0;
+ SYSNO sysno = 0;
static char *category[] = {
"CategoryList",
"TargetInfo",
node_categoryList = zcl->data1_categoryList;
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_writeCategoryList");
+ yaz_log (YLOG_LOG, "zebraExplain_writeCategoryList");
#endif
drec = createRecord (zei->records, &sysno);
-
- node_ci = data1_search_tag (zei->dh, node_categoryList->child,
- "categoryList");
+
+ node_ci = data1_search_tag (zei->dh, node_categoryList,
+ "/categoryList");
assert (node_ci);
- node_ci = data1_add_tag (zei->dh, node_ci, "categories", zei->nmem);
+ node_ci = data1_mk_tag (zei->dh, zei->nmem, "categories", 0 /* attr */,
+ node_ci);
assert (node_ci);
for (i = 0; category[i]; i++)
{
- data1_node *node_cat = data1_add_tag (zei->dh, node_ci,
- "category", zei->nmem);
+ data1_node *node_cat = data1_mk_tag (zei->dh, zei->nmem, "category",
+ 0 /* attr */, node_ci);
- data1_add_tagdata_text (zei->dh, node_cat, "name",
+ data1_mk_tag_data_text (zei->dh, node_cat, "name",
category[i], zei->nmem);
}
/* extract *searchable* keys from it. We do this here, because
zad->dirty = 0;
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_writeAttributeDetails");
+ yaz_log (YLOG_LOG, "zebraExplain_writeAttributeDetails");
#endif
drec = createRecord (zei->records, &zad->sysno);
assert (zad->data1_tree);
- node_adinfo = data1_search_tag (zei->dh, zad->data1_tree->child,
- "attributeDetails");
+
+ node_adinfo = data1_search_tag (zei->dh, zad->data1_tree,
+ "/attributeDetails");
zebraExplain_updateCommonInfo (zei, node_adinfo);
- data1_add_tagdata_text (zei->dh, node_adinfo, "name",
+ data1_mk_tag_data_text (zei->dh, node_adinfo, "name",
databaseName, zei->nmem);
/* extract *searchable* keys from it. We do this here, because
if (key_flush)
(*zei->updateFunc)(zei->updateHandle, drec, zad->data1_tree);
- node_attributesBySet = data1_make_tag (zei->dh, node_adinfo,
- "attributesBySet", zei->nmem);
+ node_attributesBySet = data1_mk_tag_uni (zei->dh, zei->nmem,
+ "attributesBySet", node_adinfo);
set_min = -1;
while (1)
{
if (set_ordinal < 0)
break;
set_min = set_ordinal;
- node_asd = data1_add_tag (zei->dh, node_attributesBySet,
- "attributeSetDetails", zei->nmem);
+ node_asd = data1_mk_tag (zei->dh, zei->nmem,
+ "attributeSetDetails",
+ 0 /* attr */, node_attributesBySet);
attset = data1_attset_search_id (zei->dh, set_ordinal);
if (!attset)
if (oid_ent_to_oid (&oe, oid))
{
data1_node *node_abt, *node_atd, *node_atvs;
- data1_add_tagdata_oid (zei->dh, node_asd, "oid",
+ data1_mk_tag_data_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,
+ node_abt = data1_mk_tag (zei->dh, zei->nmem,
+ "attributesByType",
+ 0 /*attr */, node_asd);
+ node_atd = data1_mk_tag (zei->dh, zei->nmem,
+ "attributeTypeDetails",
+ 0 /* attr */, node_abt);
+ data1_mk_tag_data_int (zei->dh, node_atd,
"type", 1, zei->nmem);
- node_atvs = data1_add_tag (zei->dh, node_atd,
- "attributeValues", zei->nmem);
+ node_atvs = data1_mk_tag (zei->dh, zei->nmem,
+ "attributeValues",
+ 0 /* attr */, node_atd);
writeAttributeValueDetails (zei, zad, node_atvs, attset);
}
}
}
/* zebra info (private) */
- node_zebra = data1_make_tag (zei->dh, node_adinfo,
- "zebraInfo", zei->nmem);
- node_list = data1_make_tag (zei->dh, node_zebra,
- "attrlist", zei->nmem);
+ node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
+ "zebraInfo", node_adinfo);
+ node_list = data1_mk_tag_uni (zei->dh, zei->nmem,
+ "attrlist", node_zebra);
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);
+ node_attr = data1_mk_tag (zei->dh, zei->nmem, "attr", 0 /* attr */,
+ node_list);
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",
+ data1_mk_tag_data_text (zei->dh, node_attr, "set",
oident.desc, zei->nmem);
- data1_add_tagdata_int (zei->dh, node_attr, "use",
+ data1_mk_tag_data_int (zei->dh, node_attr, "use",
zsui->info.use, zei->nmem);
- data1_add_tagdata_int (zei->dh, node_attr, "ordinal",
+ data1_mk_tag_data_int (zei->dh, node_attr, "ordinal",
zsui->info.ordinal, zei->nmem);
}
/* convert to "SGML" and write it */
zdi->dirty = 0;
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_writeDatabase %s", zdi->databaseName);
+ yaz_log (YLOG_LOG, "zebraExplain_writeDatabase %s", zdi->databaseName);
#endif
drec = createRecord (zei->records, &zdi->sysno);
assert (zdi->data1_database);
- node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database->child,
- "databaseInfo");
+ node_dbinfo = data1_search_tag (zei->dh, zdi->data1_database,
+ "/databaseInfo");
+
+ assert (node_dbinfo);
zebraExplain_updateCommonInfo (zei, node_dbinfo);
zebraExplain_updateAccessInfo (zei, node_dbinfo, zdi->accessInfo);
if (key_flush)
(*zei->updateFunc)(zei->updateHandle, drec, zdi->data1_database);
/* record count */
- node_count = data1_make_tag (zei->dh, node_dbinfo,
- "recordCount", zei->nmem);
- data1_add_tagdata_int (zei->dh, node_count, "recordCountActual",
- zdi->recordCount, zei->nmem);
+ node_count = data1_mk_tag_uni (zei->dh, zei->nmem,
+ "recordCount", node_dbinfo);
+ data1_mk_tag_data_zint (zei->dh, node_count, "recordCountActual",
+ zdi->recordCount, zei->nmem);
/* zebra info (private) */
- node_zebra = data1_make_tag (zei->dh, node_dbinfo,
- "zebraInfo", zei->nmem);
- data1_add_tagdata_int (zei->dh, node_zebra,
+ node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
+ "zebraInfo", node_dbinfo);
+ data1_mk_tag_data_zint (zei->dh, node_zebra,
"recordBytes", zdi->recordBytes, zei->nmem);
/* convert to "SGML" and write it */
#if ZINFO_DEBUG
{
data1_node *node_value;
- node_value = data1_add_tag (zei->dh, node_values, "attributeValue",
- zei->nmem);
- data1_add_tagdata_text (zei->dh, node_value, "name",
+ node_value = data1_mk_tag (zei->dh, zei->nmem, "attributeValue",
+ 0 /* attr */, node_values);
+ data1_mk_tag_data_text (zei->dh, node_value, "name",
atts->name, zei->nmem);
- node_value = data1_add_tag (zei->dh, node_value, "value", zei->nmem);
- data1_add_tagdata_int (zei->dh, node_value, "numeric",
+ node_value = data1_mk_tag (zei->dh, zei->nmem, "value",
+ 0 /* attr */, node_value);
+ data1_mk_tag_data_int (zei->dh, node_value, "numeric",
atts->value, zei->nmem);
}
}
attset = data1_attset_search_id (zei->dh, entp->value);
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_writeAttributeSet %s",
+ yaz_log (YLOG_LOG, "zebraExplain_writeAttributeSet %s",
attset ? attset->name : "<unknown>");
#endif
"<explain><attributeSetInfo>AttributeSetInfo\n"
"</></>\n" );
- node_attinfo = data1_search_tag (zei->dh, node_root->child,
- "attributeSetInfo");
+ node_attinfo = data1_search_tag (zei->dh, node_root,
+ "/attributeSetInfo");
+ assert (node_attinfo);
zebraExplain_initCommonInfo (zei, node_attinfo);
zebraExplain_updateCommonInfo (zei, node_attinfo);
- data1_add_tagdata_oid (zei->dh, node_attinfo,
+ data1_mk_tag_data_oid (zei->dh, node_attinfo,
"oid", o->oid, zei->nmem);
if (attset && attset->name)
- data1_add_tagdata_text (zei->dh, node_attinfo,
+ data1_mk_tag_data_text (zei->dh, node_attinfo,
"name", attset->name, zei->nmem);
- node_attributes = data1_make_tag (zei->dh, node_attinfo,
- "attributes", zei->nmem);
- node_atttype = data1_make_tag (zei->dh, node_attributes,
- "attributeType", zei->nmem);
- data1_add_tagdata_text (zei->dh, node_atttype,
+ node_attributes = data1_mk_tag_uni (zei->dh, zei->nmem,
+ "attributes", node_attinfo);
+ node_atttype = data1_mk_tag_uni (zei->dh, zei->nmem,
+ "attributeType", node_attributes);
+ data1_mk_tag_data_text (zei->dh, node_atttype,
"name", "Use", zei->nmem);
- data1_add_tagdata_text (zei->dh, node_atttype,
+ data1_mk_tag_data_text (zei->dh, node_atttype,
"description", "Use Attribute", zei->nmem);
- data1_add_tagdata_int (zei->dh, node_atttype,
+ data1_mk_tag_data_int (zei->dh, node_atttype,
"type", 1, zei->nmem);
- node_values = data1_add_tag (zei->dh, node_atttype,
- "attributeValues", zei->nmem);
+ node_values = data1_mk_tag (zei->dh, zei->nmem,
+ "attributeValues", 0 /* attr */, node_atttype);
if (attset)
writeAttributeValues (zei, node_values, attset);
trec = rec_get (zei->records, 1);
xfree (trec->info[recInfo_storeData]);
- node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target->child,
- "targetInfo");
+ node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target,
+ "/targetInfo");
assert (node_tgtinfo);
zebraExplain_updateCommonInfo (zei, node_tgtinfo);
if (key_flush)
(*zei->updateFunc)(zei->updateHandle, trec, zei->data1_target);
- node_zebra = data1_make_tag (zei->dh, node_tgtinfo,
- "zebraInfo", zei->nmem);
- data1_add_tagdata_text (zei->dh, node_zebra, "version",
+ node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
+ "zebraInfo", node_tgtinfo);
+ data1_mk_tag_data_text (zei->dh, node_zebra, "version",
ZEBRAVER, zei->nmem);
- node_list = data1_add_tag (zei->dh, node_zebra,
- "databaseList", zei->nmem);
+ node_list = data1_mk_tag (zei->dh, zei->nmem,
+ "databaseList", 0 /* attr */, node_zebra);
for (zdi = zei->databaseInfo; zdi; zdi = zdi->next)
{
data1_node *node_db;
- node_db = data1_add_tag (zei->dh, node_list,
- "database", zei->nmem);
- data1_add_tagdata_text (zei->dh, node_db, "name",
- zdi->databaseName, zei->nmem);
- data1_add_tagdata_int (zei->dh, node_db, "id",
- zdi->sysno, zei->nmem);
- data1_add_tagdata_int (zei->dh, node_db, "attributeDetailsId",
- zdi->attributeDetails->sysno, zei->nmem);
+ node_db = data1_mk_tag (zei->dh, zei->nmem,
+ "database", 0 /* attr */, node_list);
+ data1_mk_tag_data_text (zei->dh, node_db, "name",
+ zdi->databaseName, zei->nmem);
+ data1_mk_tag_data_zint (zei->dh, node_db, "id",
+ zdi->sysno, zei->nmem);
+ data1_mk_tag_data_zint (zei->dh, node_db, "attributeDetailsId",
+ zdi->attributeDetails->sysno, zei->nmem);
}
- data1_add_tagdata_int (zei->dh, node_zebra, "ordinalSU",
- zei->ordinalSU, zei->nmem);
+ data1_mk_tag_data_int (zei->dh, node_zebra, "ordinalSU",
+ zei->ordinalSU, zei->nmem);
- data1_add_tagdata_int (zei->dh, node_zebra, "runNumber",
- zei->runNumber, zei->nmem);
+ data1_mk_tag_data_zint (zei->dh, node_zebra, "runNumber",
+ zei->runNumber, zei->nmem);
#if ZINFO_DEBUG
data1_pr_tree (zei->dh, zei->data1_target, stderr);
return -1;
}
+int zebraExplain_trav_ord(ZebraExplainInfo zei, void *handle,
+ int (*f)(void *handle, int ord))
+{
+ struct zebDatabaseInfoB *zdb = zei->curDatabaseInfo;
+ if (zdb)
+ {
+ struct zebSUInfoB *zsui = zdb->attributeDetails->SUInfo;
+ for ( ;zsui; zsui = zsui->next)
+ (*f)(handle, zsui->info.ordinal);
+ }
+ return 0;
+}
+
int zebraExplain_lookup_ord (ZebraExplainInfo zei, int ord,
const char **db, int *set, int *use)
{
}
}
-int zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
+zint zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
{
if (adjust_num)
+ {
zei->dirty = 1;
+ }
return zei->runNumber += adjust_num;
}
{
data1_handle dh = (data1_handle) p;
if (!data1_get_attset (dh, name))
- logf (LOG_WARN, "Couldn't load attribute set %s", name);
+ yaz_log (YLOG_WARN, "Directive attset failed for %s", name);
}
void zebraExplain_loadAttsets (data1_handle dh, Res res)
projects / idzebra-moved-to-github.git / blobdiff