X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Flogrpn.c;h=379dad0928a856032d9152b3fca717d30d3670ca;hp=14bca6d4ee1b9bf41542e22e6deb91bdf3265588;hb=8cb8947e3a7bff4dbf8f124871cb4905df1adce7;hpb=8d691989077a0addcbd840d769dce6700f3d9622

diff --git a/src/logrpn.c b/src/logrpn.c
index 14bca6d..379dad0 100644
--- a/src/logrpn.c
+++ b/src/logrpn.c
@@ -1,22 +1,23 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: logrpn.c,v 1.15 2007-01-03 08:42:15 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
+ * See the file LICENSE for details.
  */
-
 /**
  * \file logrpn.c
  * \brief Implements Z39.50 Query Printing
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <assert.h>
 
 #include <yaz/log.h>
 #include <yaz/logrpn.h>
+#include <yaz/oid_db.h>
 
-static const char *relToStr(int v)
+static const char *relToStr(Odr_int v)
 {
     const char *str = 0;
     switch (v)
@@ -35,201 +36,197 @@ static const char *relToStr(int v)
     return str;
 }
 
-static void attrStr (int type, int value, enum oid_value ast, char *str)
+static void attrStr(Odr_int type, Odr_int value, char *str)
 {
     const char *rstr;
     *str = '\0';
-    switch (ast)
+    switch (type)
     {
-    case VAL_BIB1:
-    case VAL_EXP1:
-    case VAL_GILS:
-        switch (type)
+    case 1:
+        sprintf(str, "use");
+        break;
+    case 2:
+        rstr = relToStr(value);
+        if (rstr)
+            sprintf(str, "relation=%s", rstr);
+        else
+            sprintf(str, "relation=" ODR_INT_PRINTF, value);
+        break;
+    case 3:
+        switch (value)
         {
         case 1:
-            sprintf (str, "use");
+            sprintf(str, "position=First in field");
             break;
         case 2:
-            rstr = relToStr(value);
-            if (rstr)
-                sprintf(str, "relation=%s", rstr);
-            else
-                sprintf(str, "relation=%d", value);
+            sprintf(str, "position=First in any subfield");
             break;
         case 3:
-            switch (value)
-            {
-            case 1:
-                sprintf(str, "position=First in field");
-                break;
-            case 2:
-                sprintf(str, "position=First in any subfield");
-                break;
-            case 3:
-                sprintf(str, "position=Any position in field");
-                break;
-            default:
-                sprintf(str, "position");
-            }
+            sprintf(str, "position=Any position in field");
+            break;
+        default:
+            sprintf(str, "position");
+        }
+        break;
+    case 4:
+        switch (value)
+        {
+        case 1:
+            sprintf(str, "structure=Phrase");
+            break;
+        case 2:
+            sprintf(str, "structure=Word");
+            break;
+        case 3:
+            sprintf(str, "structure=Key");
             break;
         case 4:
-            switch (value)
-            {
-            case 1:
-                sprintf(str, "structure=Phrase");
-                break;
-            case 2:
-                sprintf(str, "structure=Word");
-                break;
-            case 3:
-                sprintf(str, "structure=Key");
-                break;
-            case 4:
-                sprintf(str, "structure=Year");
-                break;
-            case 5:
-                sprintf(str, "structure=Date");
-                break;
-            case 6:
-                sprintf(str, "structure=Word list");
-                break;
-            case 100:
-                sprintf(str, "structure=Date (un)");
-                break;
-            case 101:
-                sprintf(str, "structure=Name (norm)");
-                break;
-            case 102:
-                sprintf(str, "structure=Name (un)");
-                break;
-            case 103:
-                sprintf(str, "structure=Structure");
-                break;
-            case 104:
-                sprintf(str, "structure=urx");
-                break;
-            case 105:
-                sprintf(str, "structure=free-form-text");
-                break;
-            case 106:
-                sprintf(str, "structure=document-text");
-                break;
-            case 107:
-                sprintf(str, "structure=local-number");
-                break;
-            case 108:
-                sprintf(str, "structure=string");
-                break;
-            case 109:
-                sprintf(str, "structure=numeric string");
-                break;
-            default:
-                sprintf(str, "structure");
-            }
+            sprintf(str, "structure=Year");
             break;
         case 5:
-            switch (value)
-            {
-            case 1:
-                sprintf(str, "truncation=Right");
-                break;
-            case 2:
-                sprintf(str, "truncation=Left");
-                break;
-            case 3:
-                sprintf(str, "truncation=Left&right");
-                break;
-            case 100:
-                sprintf(str, "truncation=Do not truncate");
-                break;
-            case 101:
-                sprintf(str, "truncation=Process #");
-                break;
-            case 102:
-                sprintf(str, "truncation=re-1");
-                break;
-            case 103:
-                sprintf(str, "truncation=re-2");
-                break;
-            case 104:
-                sprintf(str, "truncation=CCL");
-                break;
-            default:
-                sprintf(str, "truncation");
-            }
+            sprintf(str, "structure=Date");
             break;
         case 6:
-            switch(value)
-            {
-            case 1:
-                sprintf(str, "completeness=Incomplete subfield");
-                break;
-            case 2:
-                sprintf(str, "completeness=Complete subfield");
-                break;
-            case 3:
-                sprintf(str, "completeness=Complete field");
-                break;
-            default:
-                sprintf(str, "completeness");
-            }
+            sprintf(str, "structure=Word list");
+            break;
+        case 100:
+            sprintf(str, "structure=Date (un)");
+            break;
+        case 101:
+            sprintf(str, "structure=Name (norm)");
+            break;
+        case 102:
+            sprintf(str, "structure=Name (un)");
+            break;
+        case 103:
+            sprintf(str, "structure=Structure");
+            break;
+        case 104:
+            sprintf(str, "structure=urx");
+            break;
+        case 105:
+            sprintf(str, "structure=free-form-text");
+            break;
+        case 106:
+            sprintf(str, "structure=document-text");
+            break;
+        case 107:
+            sprintf(str, "structure=local-number");
+            break;
+        case 108:
+            sprintf(str, "structure=string");
+            break;
+        case 109:
+            sprintf(str, "structure=numeric string");
             break;
+        default:
+            sprintf(str, "structure");
         }
         break;
-    default:
+    case 5:
+        switch (value)
+        {
+        case 1:
+            sprintf(str, "truncation=Right");
+            break;
+        case 2:
+            sprintf(str, "truncation=Left");
+            break;
+        case 3:
+            sprintf(str, "truncation=Left&right");
+            break;
+        case 100:
+            sprintf(str, "truncation=Do not truncate");
+            break;
+        case 101:
+            sprintf(str, "truncation=Process #");
+            break;
+        case 102:
+            sprintf(str, "truncation=re-1");
+            break;
+        case 103:
+            sprintf(str, "truncation=re-2");
+            break;
+        case 104:
+            sprintf(str, "truncation=CCL");
+            break;
+        default:
+            sprintf(str, "truncation");
+        }
+        break;
+    case 6:
+        switch(value)
+        {
+        case 1:
+            sprintf(str, "completeness=Incomplete subfield");
+            break;
+        case 2:
+            sprintf(str, "completeness=Complete subfield");
+            break;
+        case 3:
+            sprintf(str, "completeness=Complete field");
+            break;
+        default:
+            sprintf(str, "completeness");
+        }
         break;
     }
     if (*str)
-        sprintf(str + strlen(str), " (%d=%d)", type, value);
+        sprintf(str + strlen(str), " (" ODR_INT_PRINTF "=" ODR_INT_PRINTF")",
+                type, value);
     else
-        sprintf(str, "%d=%d", type, value);
+        sprintf(str, ODR_INT_PRINTF "=" ODR_INT_PRINTF, type, value);
 }
 
 /*
  * zlog_attributes: print attributes of term
  */
-static void zlog_attributes (Z_AttributesPlusTerm *t, int depth,
-                             enum oid_value ast, int loglevel)
+static void zlog_attributes(Z_AttributesPlusTerm *t, int depth,
+                            const Odr_oid *ast, int loglevel)
 {
     int of, i;
     char str[80];
     int num_attributes = t->attributes->num_attributes;
-    
+
     for (of = 0; of < num_attributes; of++)
     {
-        const char *attset_name = "";
+        char attset_name_buf[OID_STR_MAX];
+        const char *attset_name = 0;
         Z_AttributeElement *element;
         element = t->attributes->attributes[of];
         if (element->attributeSet)
         {
-            oident *attrset;
-            attrset = oid_getentbyoid (element->attributeSet);
-            attset_name = attrset->desc;
+            attset_name = yaz_oid_to_string_buf(element->attributeSet,
+                                                0, attset_name_buf);
         }
-        switch (element->which) 
+        if (!attset_name)
+            attset_name = "";
+        switch (element->which)
         {
         case Z_AttributeValue_numeric:
-            attrStr (*element->attributeType,
-                     *element->value.numeric, ast, str);
-            yaz_log (loglevel, "%*.0s%s %s", depth, "", attset_name, str);
+            attrStr(*element->attributeType,
+                     *element->value.numeric, str);
+            yaz_log(loglevel, "%*.0s%s %s", depth, "", attset_name, str);
             break;
         case Z_AttributeValue_complex:
-            yaz_log (loglevel, "%*.0s%s attributeType=%d complex",
+            yaz_log(loglevel, "%*.0s%s attributeType=" ODR_INT_PRINTF
+                     " 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 (loglevel, "%*.0s  string: '%s'", depth, "",
+                    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 (loglevel, "%*.0s  numeric: '%d'", depth, "",
+                    yaz_log(loglevel, "%*.0s  numeric: '" ODR_INT_PRINTF
+                             " '", depth, "",
                              *element->value.complex->list[i]->u.numeric);
             }
             break;
         default:
-            yaz_log (loglevel, "%.*s%s attribute unknown",
+            yaz_log(loglevel, "%.*s%s attribute unknown",
                      depth, "", attset_name);
         }
     }
@@ -252,7 +249,7 @@ static char *complex_op_name(Z_Operator *op)
     }
 }
 
-static char *prox_unit_name(Z_ProximityOperator *op)
+char *yaz_prox_unit_name(Z_ProximityOperator *op)
 {
     if (op->which!=Z_ProximityOperator_known)
          return "private";
@@ -273,8 +270,8 @@ static char *prox_unit_name(Z_ProximityOperator *op)
     }
 }
 
-static void zlog_structure (Z_RPNStructure *zs, int depth, 
-        enum oid_value ast, int loglevel)
+static void zlog_structure(Z_RPNStructure *zs, int depth,
+                           const Odr_oid *ast, int loglevel)
 {
     if (zs->which == Z_RPNStructure_complex)
     {
@@ -284,25 +281,26 @@ static void zlog_structure (Z_RPNStructure *zs, int depth,
         case Z_Operator_and:
         case Z_Operator_or:
         case Z_Operator_and_not:
-            yaz_log (loglevel, "%*.0s %s", depth, "", complex_op_name(op) );
+            yaz_log(loglevel, "%*.0s %s", depth, "", complex_op_name(op) );
             break;
         case Z_Operator_prox:
-            yaz_log (loglevel, "%*.0s prox excl=%s dist=%d order=%s "
+            yaz_log(loglevel, "%*.0s prox excl=%s dist=" ODR_INT_PRINTF
+                     " order=%s "
                      "rel=%s unit=%s",
                      depth, "", op->u.prox->exclusion ?
-                     (*op->u.prox->exclusion ? "T" : "F") : "N", 
+                     (*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) );
+                     yaz_prox_unit_name(op->u.prox) );
             break;
         default:
-            yaz_log (loglevel, "%*.0s unknown complex", depth, "");
+            yaz_log(loglevel, "%*.0s unknown complex", depth, "");
             return;
         }
-        zlog_structure (zs->u.complex->s1, depth+2, ast, loglevel);
-        zlog_structure (zs->u.complex->s2, depth+2, ast, loglevel);
-    } 
+        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)
@@ -312,55 +310,42 @@ static void zlog_structure (Z_RPNStructure *zs, int depth,
             switch (zapt->term->which)
             {
             case Z_Term_general:
-                yaz_log (loglevel, "%*.0s term '%.*s' (general)", depth, "",
+                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 (loglevel, "%*.0s term '%s' (string)", depth, "",
+                yaz_log(loglevel, "%*.0s term '%s' (string)", depth, "",
                          zapt->term->u.characterString);
                 break;
             case Z_Term_numeric:
-                yaz_log (loglevel, "%*.0s term '%d' (numeric)", depth, "",
+                yaz_log(loglevel, "%*.0s term '" ODR_INT_PRINTF
+                         "' (numeric)", depth, "",
                          *zapt->term->u.numeric);
                 break;
             case Z_Term_null:
-                yaz_log (loglevel, "%*.0s term (null)", depth, "");
+                yaz_log(loglevel, "%*.0s term (null)", depth, "");
                 break;
             default:
-                yaz_log (loglevel, "%*.0s term (not general)", depth, "");
+                yaz_log(loglevel, "%*.0s term (not general)", depth, "");
             }
-            zlog_attributes (zapt, depth+2, ast, loglevel);
+            zlog_attributes(zapt, depth+2, ast, loglevel);
         }
         else if (zs->u.simple->which == Z_Operand_resultSetId)
         {
-            yaz_log (loglevel, "%*.0s set '%s'", depth, "",
+            yaz_log(loglevel, "%*.0s set '%s'", depth, "",
                      zs->u.simple->u.resultSetId);
         }
         else
-            yaz_log (loglevel, "%*.0s unknown simple structure", depth, "");
+            yaz_log(loglevel, "%*.0s unknown simple structure", depth, "");
     }
     else
-        yaz_log (loglevel, "%*.0s unknown structure", depth, "");
+        yaz_log(loglevel, "%*.0s unknown structure", depth, "");
 }
 
-void log_rpn_query_level (int loglevel, Z_RPNQuery *rpn)
+void log_rpn_query_level(int loglevel, Z_RPNQuery *rpn)
 {
-    oident *attrset;
-    enum oid_value ast;
-    
-    attrset = oid_getentbyoid (rpn->attributeSetId);
-    if (attrset)
-    {
-        ast = attrset->value;
-        yaz_log (loglevel, "RPN query. Type: %s", attrset->desc);
-    } 
-    else
-    {
-        ast = VAL_NONE;
-        yaz_log (loglevel, "RPN query. Unknown type");
-    }
-    zlog_structure (rpn->RPNStructure, 0, ast, loglevel);
+    zlog_structure(rpn->RPNStructure, 0, rpn->attributeSetId, loglevel);
 }
 
 void log_rpn_query(Z_RPNQuery *rpn)
@@ -368,35 +353,35 @@ void log_rpn_query(Z_RPNQuery *rpn)
     log_rpn_query_level(YLOG_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, const Odr_oid *ast)
 {
     int depth = 0;
     if (!loglevel)
         return;
-    if (zapt->term->which == Z_Term_general) 
+    if (zapt->term->which == Z_Term_general)
     {
-        yaz_log (loglevel, "%*.0s term '%.*s' (general)", depth, "",
+        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, "");
-    zlog_attributes (zapt, depth+2, ast, loglevel);
+        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, const Odr_oid *ast)
 {
-    log_scan_term_level (YLOG_LOG, zapt, ast);
+    log_scan_term_level(YLOG_LOG, zapt, ast);
 }
 
-void yaz_log_zquery_level (int loglevel, Z_Query *q)
+void yaz_log_zquery_level(int loglevel, Z_Query *q)
 {
     if (!loglevel)
-        return; 
+        return;
     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);
@@ -407,37 +392,19 @@ void yaz_log_zquery_level (int loglevel, Z_Query *q)
         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);
+            yaz_log(loglevel, "CQL: %s", q->u.type_104->u.cql);
     }
 }
 
-void yaz_log_zquery (Z_Query *q)
+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
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab