X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Flogrpn.c;h=fbcd0ab640e7f27c147eb9a414eae173aea77356;hp=a3967061560c4ca46a35240c07a1c3a53739515e;hb=922617826ecc28cbdcbc5e6d5037843c7985a408;hpb=05c274ef315384faafcc5900c17468f0ea2474e6

diff --git a/src/logrpn.c b/src/logrpn.c
index a396706..fbcd0ab 100644
--- a/src/logrpn.c
+++ b/src/logrpn.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 1995-2004, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
  * All rights reserved.
  *
- * $Id: logrpn.c,v 1.3 2004-10-15 00:19:00 adam Exp $
+ * $Id: logrpn.c,v 1.14 2006-01-20 10:34:51 adam Exp $
  */
 
 /**
@@ -11,6 +11,7 @@
  */
 
 #include <stdio.h>
+#include <assert.h>
 
 #include <yaz/log.h>
 #include <yaz/logrpn.h>
@@ -33,6 +34,7 @@ static const char *relToStr(int v)
     }
     return str;
 }
+
 static void attrStr (int type, int value, enum oid_value ast, char *str)
 {
     const char *rstr;
@@ -50,126 +52,126 @@ static void attrStr (int type, int value, enum oid_value ast, char *str)
         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;
         }
@@ -178,16 +180,16 @@ static void attrStr (int type, int value, enum oid_value ast, char *str)
         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);
+        sprintf(str, "%d=%d", type, value);
 }
 
 /*
  * zlog_attributes: print attributes of term
  */
-static void zlog_attributes (Z_AttributesPlusTerm *t, int level,
-                             enum oid_value ast)
+static void zlog_attributes (Z_AttributesPlusTerm *t, int depth,
+                             enum oid_value ast, int loglevel)
 {
     int of, i;
     char str[80];
@@ -195,98 +197,112 @@ static void zlog_attributes (Z_AttributesPlusTerm *t, int level,
     
     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);
-            yaz_log (LOG_LOG, "%*.0s%s %s", level, "", attset_name, 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 (LOG_LOG, "%*.0s%s attributeType=%d complex",
-		  level, "", attset_name, *element->attributeType);
+            yaz_log (loglevel, "%*.0s%s attributeType=%d complex",
+                  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 (LOG_LOG, "%*.0s  string: '%s'", level, "",
-			     element->value.complex->list[i]->u.string);
+                    yaz_log (loglevel, "%*.0s  string: '%s'", depth, "",
+                             element->value.complex->list[i]->u.string);
                 else if (element->value.complex->list[i]->which ==
                          Z_StringOrNumeric_numeric)
-                    yaz_log (LOG_LOG, "%*.0s  numeric: '%d'", level, "",
-			     *element->value.complex->list[i]->u.numeric);
+                    yaz_log (loglevel, "%*.0s  numeric: '%d'", depth, "",
+                             *element->value.complex->list[i]->u.numeric);
             }
             break;
         default:
-            yaz_log (LOG_LOG, "%.*s%s attribute unknown",
-		     level, "", attset_name);
+            yaz_log (loglevel, "%.*s%s attribute unknown",
+                     depth, "", attset_name);
         }
     }
 }
 
-static void zlog_structure (Z_RPNStructure *zs, int level, enum oid_value ast)
+static char *complex_op_name(Z_Operator *op)
+{
+    switch (op->which)
+    {
+    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";
+    }
+}
+
+static char *prox_unit_name(Z_ProximityOperator *op)
+{
+    if (op->which!=Z_ProximityOperator_known)
+         return "private";
+    switch(*op->u.known)
+    {
+        case Z_ProxUnit_character: return "character";
+        case Z_ProxUnit_word: return "word";
+        case Z_ProxUnit_sentence: return "sentence";
+        case Z_ProxUnit_paragraph: return "paragraph";
+        case Z_ProxUnit_section: return "section";
+        case Z_ProxUnit_chapter: return "chapter";
+        case Z_ProxUnit_document: return "document";
+        case Z_ProxUnit_element: return "element";
+        case Z_ProxUnit_subelement: return "subelement";
+        case Z_ProxUnit_elementType: return "elementType";
+        case Z_ProxUnit_byte: return "byte";
+        default: return "unknown";
+    }
+}
+
+static void zlog_structure (Z_RPNStructure *zs, int depth, 
+        enum oid_value ast, int loglevel)
 {
     if (zs->which == Z_RPNStructure_complex)
     {
         Z_Operator *op = zs->u.complex->roperator;
-        const char *rstr = 0;
-        const char *unit = "private";
         switch (op->which)
         {
         case Z_Operator_and:
-            yaz_log (LOG_LOG, "%*.0s and", level, "");
-            break;
         case Z_Operator_or:
-            yaz_log (LOG_LOG, "%*.0s or", level, "");
-            break;
         case Z_Operator_and_not:
-            yaz_log (LOG_LOG, "%*.0s and-not", level, "");
+            yaz_log (loglevel, "%*.0s %s", depth, "", complex_op_name(op) );
             break;
-	case Z_Operator_prox:
-            if (op->u.prox->which == Z_ProximityOperator_known)
-            {
-                switch(*op->u.prox->u.known)
-                {
-                case Z_ProxUnit_character: unit = "character"; break;
-                case Z_ProxUnit_word: unit = "word"; break;
-                case Z_ProxUnit_sentence: unit = "sentence"; break;
-                case Z_ProxUnit_paragraph: unit = "paragraph"; break;
-                case Z_ProxUnit_section: unit = "section"; break;
-                case Z_ProxUnit_chapter: unit = "chapter"; break;
-                case Z_ProxUnit_document: unit = "document"; break;
-                case Z_ProxUnit_element: unit = "element"; break;
-                case Z_ProxUnit_subelement: unit = "subelement"; break;
-                case Z_ProxUnit_elementType: unit = "elementType"; break;
-                case Z_ProxUnit_byte: unit = "byte"; break;
-                default: unit = "unknown"; break;
-                }
-            }
-            rstr = relToStr(*op->u.prox->relationType);
-            yaz_log (LOG_LOG, "%*.0s prox excl=%s dist=%d order=%s "
+        case Z_Operator_prox:
+            yaz_log (loglevel, "%*.0s prox excl=%s dist=%d order=%s "
                      "rel=%s unit=%s",
-                     level, "", op->u.prox->exclusion ?
+                     depth, "", op->u.prox->exclusion ?
                      (*op->u.prox->exclusion ? "T" : "F") : "N", 
                      *op->u.prox->distance,
                      *op->u.prox->ordered ? "T" : "F",
-                     rstr ? rstr : "unknown",
-                     unit);
-	    break;
+                     relToStr(*op->u.prox->relationType),
+                     prox_unit_name(op->u.prox) );
+            break;
         default:
-            yaz_log (LOG_LOG, "%*.0s unknown complex", level, "");
+            yaz_log (loglevel, "%*.0s unknown complex", depth, "");
             return;
         }
-        zlog_structure (zs->u.complex->s1, level+2, ast);
-        zlog_structure (zs->u.complex->s2, level+2, ast);
-    }
+        zlog_structure (zs->u.complex->s1, depth+2, ast, loglevel);
+        zlog_structure (zs->u.complex->s2, depth+2, ast, loglevel);
+    } 
     else if (zs->which == Z_RPNStructure_simple)
     {
         if (zs->u.simple->which == Z_Operand_APT)
@@ -296,39 +312,39 @@ static void zlog_structure (Z_RPNStructure *zs, int level, enum oid_value ast)
             switch (zapt->term->which)
             {
             case Z_Term_general:
-                yaz_log (LOG_LOG, "%*.0s term '%.*s' (general)", level, "",
-			 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);
                 break;
             case Z_Term_characterString:
-                yaz_log (LOG_LOG, "%*.0s term '%s' (string)", level, "",
-			 zapt->term->u.characterString);
+                yaz_log (loglevel, "%*.0s term '%s' (string)", depth, "",
+                         zapt->term->u.characterString);
                 break;
             case Z_Term_numeric:
-                yaz_log (LOG_LOG, "%*.0s term '%d' (numeric)", level, "",
-			 *zapt->term->u.numeric);
+                yaz_log (loglevel, "%*.0s term '%d' (numeric)", depth, "",
+                         *zapt->term->u.numeric);
                 break;
             case Z_Term_null:
-                yaz_log (LOG_LOG, "%*.0s term (null)", level, "");
+                yaz_log (loglevel, "%*.0s term (null)", depth, "");
                 break;
             default:
-                yaz_log (LOG_LOG, "%*.0s term (not general)", level, "");
+                yaz_log (loglevel, "%*.0s term (not general)", depth, "");
             }
-            zlog_attributes (zapt, level+2, ast);
+            zlog_attributes (zapt, depth+2, ast, loglevel);
         }
         else if (zs->u.simple->which == Z_Operand_resultSetId)
         {
-            yaz_log (LOG_LOG, "%*.0s set '%s'", level, "",
-		     zs->u.simple->u.resultSetId);
+            yaz_log (loglevel, "%*.0s set '%s'", depth, "",
+                     zs->u.simple->u.resultSetId);
         }
         else
-            yaz_log (LOG_LOG, "%*.0s unknown simple structure", level, "");
+            yaz_log (loglevel, "%*.0s unknown simple structure", depth, "");
     }
     else
-        yaz_log (LOG_LOG, "%*.0s unknown structure", level, "");
+        yaz_log (loglevel, "%*.0s unknown structure", depth, "");
 }
 
-void log_rpn_query (Z_RPNQuery *rpn)
+void log_rpn_query_level (int loglevel, Z_RPNQuery *rpn)
 {
     oident *attrset;
     enum oid_value ast;
@@ -337,45 +353,93 @@ void log_rpn_query (Z_RPNQuery *rpn)
     if (attrset)
     {
         ast = attrset->value;
-	yaz_log (LOG_LOG, "RPN query. Type: %s", attrset->desc);
+        yaz_log (loglevel, "RPN query. Type: %s", attrset->desc);
     } 
     else
     {
-	ast = VAL_NONE;
-	yaz_log (LOG_LOG, "RPN query. Unknown type");
+        ast = VAL_NONE;
+        yaz_log (loglevel, "RPN query. Unknown type");
     }
-    zlog_structure (rpn->RPNStructure, 0, ast);
+    zlog_structure (rpn->RPNStructure, 0, ast, loglevel);
 }
 
-void log_scan_term (Z_AttributesPlusTerm *zapt, oid_value ast)
+void log_rpn_query(Z_RPNQuery *rpn)
 {
-    int level = 0;
+    log_rpn_query_level(YLOG_LOG, rpn);
+}
+
+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 (LOG_LOG, "%*.0s term '%.*s' (general)", level, "",
-		 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 (LOG_LOG, "%*.0s term (not general)", level, "");
-    zlog_attributes (zapt, level+2, ast);
+        yaz_log (loglevel, "%*.0s term (not general)", depth, "");
+    zlog_attributes (zapt, depth+2, ast, loglevel);
 }
 
-void yaz_log_zquery (Z_Query *q)
+void log_scan_term(Z_AttributesPlusTerm *zapt, oid_value ast)
+{
+    log_scan_term_level (YLOG_LOG, zapt, ast);
+}
+
+void yaz_log_zquery_level (int loglevel, Z_Query *q)
 {
+    if (!loglevel)
+        return; 
     switch (q->which)
     {
     case Z_Query_type_1: case Z_Query_type_101:
-	log_rpn_query (q->u.type_1);
+        log_rpn_query_level (loglevel, q->u.type_1);
         break;
     case Z_Query_type_2:
-	yaz_log(LOG_LOG, "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(LOG_LOG, "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 (LOG_LOG, "CQL: %s", q->u.type_104->u.cql);
+            yaz_log (loglevel, "CQL: %s", q->u.type_104->u.cql);
+    }
+}
+
+void yaz_log_zquery (Z_Query *q)
+{
+    yaz_log_zquery_level(YLOG_LOG, q);
+}
+
+void wrbuf_diags(WRBUF b, int num_diagnostics,Z_DiagRec **diags)
+{
+    /* we only dump the first diag - that keeps the log cleaner. */
+    wrbuf_printf(b," ERROR ");
+    if (diags[0]->which != Z_DiagRec_defaultFormat)
+        wrbuf_printf(b,"(diag not in default format?)");
+    else
+    {
+        Z_DefaultDiagFormat *e=diags[0]->u.defaultFormat;
+        if (e->condition)
+            wrbuf_printf(b, "%d ",*e->condition);
+        else
+            wrbuf_printf(b, "?? ");
+        if ((e->which==Z_DefaultDiagFormat_v2Addinfo) && (e->u.v2Addinfo))
+            wrbuf_printf(b,"%s ",e->u.v2Addinfo);
+        else if ((e->which==Z_DefaultDiagFormat_v3Addinfo) && (e->u.v3Addinfo))
+            wrbuf_printf(b,"%s ",e->u.v3Addinfo);
     }
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+