/*
- * Copyright (C) 1995-2004, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
* All rights reserved.
*
- * $Id: logrpn.c,v 1.5 2004-11-16 22:10:29 adam Exp $
+ * $Id: logrpn.c,v 1.14 2006-01-20 10:34:51 adam Exp $
*/
/**
}
return str;
}
+
static void attrStr (int type, int value, enum oid_value ast, char *str)
{
const char *rstr;
case 2:
rstr = relToStr(value);
if (rstr)
- sprintf (str, "relation=%s", rstr);
+ sprintf(str, "relation=%s", rstr);
else
- sprintf (str, "relation=%d", value);
+ sprintf(str, "relation=%d", value);
break;
case 3:
switch (value)
{
case 1:
- sprintf (str, "position=First in field");
+ sprintf(str, "position=First in field");
break;
case 2:
- sprintf (str, "position=First in any subfield");
+ sprintf(str, "position=First in any subfield");
break;
case 3:
- sprintf (str, "position=Any position in field");
+ sprintf(str, "position=Any position in field");
break;
default:
- sprintf (str, "position");
+ sprintf(str, "position");
}
break;
case 4:
switch (value)
{
case 1:
- sprintf (str, "structure=Phrase");
+ sprintf(str, "structure=Phrase");
break;
case 2:
- sprintf (str, "structure=Word");
+ sprintf(str, "structure=Word");
break;
case 3:
- sprintf (str, "structure=Key");
+ sprintf(str, "structure=Key");
break;
case 4:
- sprintf (str, "structure=Year");
+ sprintf(str, "structure=Year");
break;
case 5:
- sprintf (str, "structure=Date");
+ sprintf(str, "structure=Date");
break;
case 6:
- sprintf (str, "structure=Word list");
+ sprintf(str, "structure=Word list");
break;
case 100:
- sprintf (str, "structure=Date (un)");
+ sprintf(str, "structure=Date (un)");
break;
case 101:
- sprintf (str, "structure=Name (norm)");
+ sprintf(str, "structure=Name (norm)");
break;
case 102:
- sprintf (str, "structure=Name (un)");
+ sprintf(str, "structure=Name (un)");
break;
case 103:
- sprintf (str, "structure=Structure");
+ sprintf(str, "structure=Structure");
break;
case 104:
- sprintf (str, "structure=urx");
+ sprintf(str, "structure=urx");
break;
case 105:
- sprintf (str, "structure=free-form-text");
+ sprintf(str, "structure=free-form-text");
break;
case 106:
- sprintf (str, "structure=document-text");
+ sprintf(str, "structure=document-text");
break;
case 107:
- sprintf (str, "structure=local-number");
+ sprintf(str, "structure=local-number");
break;
case 108:
- sprintf (str, "structure=string");
+ sprintf(str, "structure=string");
break;
case 109:
- sprintf (str, "structure=numeric string");
+ sprintf(str, "structure=numeric string");
break;
default:
- sprintf (str, "structure");
+ sprintf(str, "structure");
}
break;
case 5:
switch (value)
{
case 1:
- sprintf (str, "truncation=Right");
+ sprintf(str, "truncation=Right");
break;
case 2:
- sprintf (str, "truncation=Left");
+ sprintf(str, "truncation=Left");
break;
case 3:
- sprintf (str, "truncation=Left&right");
+ sprintf(str, "truncation=Left&right");
break;
case 100:
- sprintf (str, "truncation=Do not truncate");
+ sprintf(str, "truncation=Do not truncate");
break;
case 101:
- sprintf (str, "truncation=Process #");
+ sprintf(str, "truncation=Process #");
break;
case 102:
- sprintf (str, "truncation=re-1");
+ sprintf(str, "truncation=re-1");
break;
case 103:
- sprintf (str, "truncation=re-2");
+ sprintf(str, "truncation=re-2");
break;
case 104:
- sprintf (str, "truncation=CCL");
+ sprintf(str, "truncation=CCL");
break;
default:
- sprintf (str, "truncation");
+ sprintf(str, "truncation");
}
break;
case 6:
- switch (value)
+ switch(value)
{
case 1:
- sprintf (str, "completeness=Incomplete subfield");
+ sprintf(str, "completeness=Incomplete subfield");
break;
case 2:
- sprintf (str, "completeness=Complete subfield");
+ sprintf(str, "completeness=Complete subfield");
break;
case 3:
- sprintf (str, "completeness=Complete field");
+ sprintf(str, "completeness=Complete field");
break;
default:
- sprintf (str, "completeness");
+ sprintf(str, "completeness");
}
break;
}
break;
}
if (*str)
- sprintf (str + strlen(str), " (%d=%d)", type, value);
+ sprintf(str + strlen(str), " (%d=%d)", type, value);
else
- sprintf (str, "%d=%d", type, value);
-}
-
-static void wrbuf_attr(WRBUF b, Z_AttributeElement *element)
-{
- int i;
- char *setname="";
- char *sep=""; /* optional space after attrset name */
- if (element->attributeSet)
- {
- oident *attrset;
- attrset = oid_getentbyoid (element->attributeSet);
- setname=attrset->desc;
- sep=" ";
- }
- switch (element->which)
- {
- case Z_AttributeValue_numeric:
- wrbuf_printf(b,"@attr %s%s%d=%d ", setname,sep,
- *element->attributeType, *element->value.numeric);
- break;
- case Z_AttributeValue_complex:
- wrbuf_printf(b,"@attr %s%s%d=", setname,sep,*element->attributeType);
- for (i = 0; i<element->value.complex->num_list; i++)
- {
- if (i)
- wrbuf_printf(b,",");
- if (element->value.complex->list[i]->which ==
- Z_StringOrNumeric_string)
- wrbuf_printf (b, "'%s'",
- element->value.complex->list[i]->u.string);
- else if (element->value.complex->list[i]->which ==
- Z_StringOrNumeric_numeric)
- wrbuf_printf (b, "%d",
- *element->value.complex->list[i]->u.numeric);
- }
- wrbuf_printf(b," ");
- break;
- default:
- wrbuf_printf (b, "(unknown attr type) ");
-
- }
+ sprintf(str, "%d=%d", type, value);
}
/*
for (of = 0; of < num_attributes; of++)
{
- const char *attset_name = "";
+ const char *attset_name = "";
Z_AttributeElement *element;
- element = t->attributes->attributes[of];
- if (element->attributeSet)
- {
- oident *attrset;
- attrset = oid_getentbyoid (element->attributeSet);
- attset_name = attrset->desc;
- }
+ element = t->attributes->attributes[of];
+ if (element->attributeSet)
+ {
+ oident *attrset;
+ attrset = oid_getentbyoid (element->attributeSet);
+ attset_name = attrset->desc;
+ }
switch (element->which)
{
case Z_AttributeValue_numeric:
- attrStr (*element->attributeType,
- *element->value.numeric, ast, str);
+ attrStr (*element->attributeType,
+ *element->value.numeric, ast, str);
yaz_log (loglevel, "%*.0s%s %s", depth, "", attset_name, str);
break;
case Z_AttributeValue_complex:
yaz_log (loglevel, "%*.0s%s attributeType=%d complex",
- depth, "", attset_name, *element->attributeType);
+ depth, "", attset_name, *element->attributeType);
for (i = 0; i<element->value.complex->num_list; i++)
{
if (element->value.complex->list[i]->which ==
Z_StringOrNumeric_string)
yaz_log (loglevel, "%*.0s string: '%s'", depth, "",
- element->value.complex->list[i]->u.string);
+ element->value.complex->list[i]->u.string);
else if (element->value.complex->list[i]->which ==
Z_StringOrNumeric_numeric)
yaz_log (loglevel, "%*.0s numeric: '%d'", depth, "",
- *element->value.complex->list[i]->u.numeric);
+ *element->value.complex->list[i]->u.numeric);
}
break;
default:
yaz_log (loglevel, "%.*s%s attribute unknown",
- depth, "", attset_name);
+ depth, "", attset_name);
}
}
}
{
switch (op->which)
{
- case Z_Operator_and:
- return "and";
- case Z_Operator_or:
- return "or";
- case Z_Operator_and_not:
- return "and-not";
- case Z_Operator_prox:
- return "prox";
- default:
- return "unknown complex operator";
+ case Z_Operator_and:
+ return "and";
+ case Z_Operator_or:
+ return "or";
+ case Z_Operator_and_not:
+ return "not";
+ case Z_Operator_prox:
+ return "prox";
+ default:
+ return "unknown complex operator";
}
}
case Z_Operator_and_not:
yaz_log (loglevel, "%*.0s %s", depth, "", complex_op_name(op) );
break;
- case Z_Operator_prox:
+ case Z_Operator_prox:
yaz_log (loglevel, "%*.0s prox excl=%s dist=%d order=%s "
"rel=%s unit=%s",
depth, "", op->u.prox->exclusion ?
*op->u.prox->ordered ? "T" : "F",
relToStr(*op->u.prox->relationType),
prox_unit_name(op->u.prox) );
- break;
+ break;
default:
yaz_log (loglevel, "%*.0s unknown complex", depth, "");
return;
{
case Z_Term_general:
yaz_log (loglevel, "%*.0s term '%.*s' (general)", depth, "",
- zapt->term->u.general->len,
- zapt->term->u.general->buf);
+ zapt->term->u.general->len,
+ zapt->term->u.general->buf);
break;
case Z_Term_characterString:
yaz_log (loglevel, "%*.0s term '%s' (string)", depth, "",
- zapt->term->u.characterString);
+ zapt->term->u.characterString);
break;
case Z_Term_numeric:
yaz_log (loglevel, "%*.0s term '%d' (numeric)", depth, "",
- *zapt->term->u.numeric);
+ *zapt->term->u.numeric);
break;
case Z_Term_null:
yaz_log (loglevel, "%*.0s term (null)", depth, "");
else if (zs->u.simple->which == Z_Operand_resultSetId)
{
yaz_log (loglevel, "%*.0s set '%s'", depth, "",
- zs->u.simple->u.resultSetId);
+ zs->u.simple->u.resultSetId);
}
else
yaz_log (loglevel, "%*.0s unknown simple structure", depth, "");
yaz_log (loglevel, "%*.0s unknown structure", depth, "");
}
-static void wrbuf_structure (WRBUF b, Z_RPNStructure *zs, enum oid_value ast)
-{
- int i;
- if (zs->which == Z_RPNStructure_complex)
- {
- Z_Operator *op = zs->u.complex->roperator;
- wrbuf_printf(b, "@%s ", complex_op_name(op) );
- if (op->which== Z_Operator_prox)
- {
- wrbuf_printf(b, "(excl=%s dist=%d order=%s "
- "rel=%s unit=%s) ",
- op->u.prox->exclusion ?
- (*op->u.prox->exclusion ? "T" : "F") : "N",
- *op->u.prox->distance,
- *op->u.prox->ordered ? "T" : "F",
- relToStr(*op->u.prox->relationType),
- prox_unit_name(op->u.prox) );
- }
- wrbuf_structure (b,zs->u.complex->s1, ast);
- wrbuf_structure (b,zs->u.complex->s2, ast);
- }
- else if (zs->which == Z_RPNStructure_simple)
- {
- if (zs->u.simple->which == Z_Operand_APT)
- {
- Z_AttributesPlusTerm *zapt = zs->u.simple->u.attributesPlusTerm;
- int num_attributes = zapt->attributes->num_attributes;
- for (i=0;i<num_attributes;i++)
- wrbuf_attr(b,zapt->attributes->attributes[i]);
-
- switch (zapt->term->which)
- {
- case Z_Term_general:
- wrbuf_printf(b, "'%.*s' ",
- zapt->term->u.general->len,
- zapt->term->u.general->buf);
- break;
- case Z_Term_characterString:
- wrbuf_printf(b, "\"%s\" ", zapt->term->u.characterString);
- break;
- case Z_Term_numeric:
- wrbuf_printf(b, "%d ", *zapt->term->u.numeric);
- break;
- case Z_Term_null:
- wrbuf_printf(b, "(null) ");
- break;
- default:
- wrbuf_printf(b, "(unknown term type %d) ", zapt->term->which);
- }
- }
- else if (zs->u.simple->which == Z_Operand_resultSetId)
- {
- wrbuf_printf(b, "@set '%s' ", zs->u.simple->u.resultSetId);
- }
- else
- wrbuf_printf (b, "(unknown simple structure)");
- }
- else
- wrbuf_puts(b, "(unknown structure)");
-}
-
void log_rpn_query_level (int loglevel, Z_RPNQuery *rpn)
{
oident *attrset;
if (attrset)
{
ast = attrset->value;
- yaz_log (loglevel, "RPN query. Type: %s", attrset->desc);
+ yaz_log (loglevel, "RPN query. Type: %s", attrset->desc);
}
else
{
- ast = VAL_NONE;
- yaz_log (loglevel, "RPN query. Unknown type");
+ ast = VAL_NONE;
+ yaz_log (loglevel, "RPN query. Unknown type");
}
zlog_structure (rpn->RPNStructure, 0, ast, loglevel);
}
-static void wrbuf_rpn_query(WRBUF b, Z_RPNQuery *rpn)
+void log_rpn_query(Z_RPNQuery *rpn)
{
- oident *attrset;
- enum oid_value ast;
-
- attrset = oid_getentbyoid (rpn->attributeSetId);
- if (attrset)
- {
- ast = attrset->value;
- wrbuf_printf(b, " @attrset %s ", attrset->desc);
- }
- else
- {
- ast = VAL_NONE;
- wrbuf_printf (b, "Unknown:");
- }
- wrbuf_structure (b,rpn->RPNStructure, ast);
-
+ log_rpn_query_level(YLOG_LOG, rpn);
}
-void log_rpn_query (Z_RPNQuery *rpn)
-{
- log_rpn_query_level(LOG_LOG, rpn);
-}
-
-void log_scan_term_level (int loglevel,
- Z_AttributesPlusTerm *zapt, oid_value ast)
+void log_scan_term_level(int loglevel,
+ Z_AttributesPlusTerm *zapt, oid_value ast)
{
int depth = 0;
if (!loglevel)
return;
if (zapt->term->which == Z_Term_general)
{
- yaz_log (loglevel, "%*.0s term '%.*s' (general)", depth, "",
- zapt->term->u.general->len, zapt->term->u.general->buf);
+ yaz_log (loglevel, "%*.0s term '%.*s' (general)", depth, "",
+ zapt->term->u.general->len, zapt->term->u.general->buf);
}
else
- yaz_log (loglevel, "%*.0s term (not general)", depth, "");
+ yaz_log (loglevel, "%*.0s term (not general)", depth, "");
zlog_attributes (zapt, depth+2, ast, loglevel);
}
-void log_scan_term (Z_AttributesPlusTerm *zapt, oid_value ast)
+void log_scan_term(Z_AttributesPlusTerm *zapt, oid_value ast)
{
- log_scan_term_level (LOG_LOG, zapt, ast);
-}
-
-void wrbuf_scan_term(WRBUF b, Z_AttributesPlusTerm *zapt, oid_value ast)
-{
- int num_attributes = zapt->attributes->num_attributes;
- int i;
- for (i=0;i<num_attributes;i++)
- wrbuf_attr(b,zapt->attributes->attributes[i]);
- if (zapt->term->which == Z_Term_general)
- {
- wrbuf_printf (b, "'%.*s' ",
- zapt->term->u.general->len,
- zapt->term->u.general->buf);
- }
- else
- wrbuf_printf (b, "(not a general term)");
+ log_scan_term_level (YLOG_LOG, zapt, ast);
}
void yaz_log_zquery_level (int loglevel, Z_Query *q)
switch (q->which)
{
case Z_Query_type_1: case Z_Query_type_101:
- log_rpn_query_level (loglevel, q->u.type_1);
+ log_rpn_query_level (loglevel, q->u.type_1);
break;
case Z_Query_type_2:
- yaz_log(loglevel, "CCL: %.*s", q->u.type_2->len, q->u.type_2->buf);
- break;
+ yaz_log(loglevel, "CCL: %.*s", q->u.type_2->len, q->u.type_2->buf);
+ break;
case Z_Query_type_100:
- yaz_log(loglevel, "Z39.58: %.*s", q->u.type_100->len,
- q->u.type_100->buf);
- break;
+ yaz_log(loglevel, "Z39.58: %.*s", q->u.type_100->len,
+ q->u.type_100->buf);
+ break;
case Z_Query_type_104:
if (q->u.type_104->which == Z_External_CQL)
yaz_log (loglevel, "CQL: %s", q->u.type_104->u.cql);
void yaz_log_zquery (Z_Query *q)
{
- yaz_log_zquery_level(LOG_LOG,q);
-}
-
-void wrbuf_put_zquery(WRBUF b, Z_Query *q)
-{
- assert(q);
- assert(b);
- switch (q->which)
- {
- case Z_Query_type_1:
- case Z_Query_type_101:
- wrbuf_printf(b,"Z:");
- wrbuf_rpn_query(b,q->u.type_1);
- break;
- case Z_Query_type_2:
- wrbuf_printf(b, "CCL: %.*s", q->u.type_2->len, q->u.type_2->buf);
- break;
- case Z_Query_type_100:
- wrbuf_printf(b, "Z39.58: %.*s", q->u.type_100->len,
- q->u.type_100->buf);
- break;
- case Z_Query_type_104:
- if (q->u.type_104->which == Z_External_CQL)
- wrbuf_printf(b, "CQL: %s", q->u.type_104->u.cql);
- else
- wrbuf_printf(b,"Unknown type 104 query %d", q->u.type_104->which);
- }
+ yaz_log_zquery_level(YLOG_LOG, q);
}
void wrbuf_diags(WRBUF b, int num_diagnostics,Z_DiagRec **diags)
wrbuf_printf(b,"%s ",e->u.v3Addinfo);
}
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / yaz-moved-to-github.git / blobdiff