X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flogrpn.c;h=3da47d3abc543695dd07d9f85a5cb29f23f65711;hb=455798a3154b5c08c872ca0fb90607ddea575038;hp=7983d722f73b2df0950226acaeb1e06bae6311d9;hpb=a4916ca87f9921a945ef68479f33c2bfe6fa6897;p=yaz-moved-to-github.git

diff --git a/src/logrpn.c b/src/logrpn.c
index 7983d72..3da47d3 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.5 2004-11-16 22:10:29 adam Exp $
+ * $Id: logrpn.c,v 1.12 2005-08-22 20:34:21 adam Exp $
  */
 
 /**
@@ -16,6 +16,7 @@
 #include <yaz/log.h>
 #include <yaz/logrpn.h>
 
+
 static const char *relToStr(int v)
 {
     const char *str = 0;
@@ -34,6 +35,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;
@@ -184,44 +186,65 @@ static void attrStr (int type, int value, enum oid_value ast, char *str)
         sprintf (str, "%d=%d", type, value);
 }
 
+static void wrbuf_term(WRBUF b, const char *term, int len)
+{
+    int i;
+    for (i = 0; i < len; i++)
+        if (strchr(" \"{", term[i]))
+            break;
+    if (i == len && i)
+        wrbuf_printf(b, "%.*s ", len, term);
+    else
+    {
+        wrbuf_putc(b, '"');
+        for (i = 0; i<len; i++)
+        {
+            if (term[i] == '"')
+                wrbuf_putc(b, '\\');
+            wrbuf_putc(b, term[i]);
+        }
+        wrbuf_printf(b, "\" ");
+    }
+}
+
 static void wrbuf_attr(WRBUF b, Z_AttributeElement *element)
 {
     int i;
     char *setname="";
-    char *sep=""; /* optional space after attrset name */
+    char *sep = ""; /* optional space after attrset name */
     if (element->attributeSet)
     {
         oident *attrset;
         attrset = oid_getentbyoid (element->attributeSet);
-        setname=attrset->desc;
-        sep=" ";
+        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) ");
-		     
+    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, "@attr 1=unknown ");
     }
 }
 
@@ -237,40 +260,40 @@ static void zlog_attributes (Z_AttributesPlusTerm *t, int depth,
     
     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);
         }
     }
 }
@@ -279,16 +302,16 @@ 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 "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";
     }
 }
 
@@ -326,7 +349,7 @@ static void zlog_structure (Z_RPNStructure *zs, int depth,
         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 ?
@@ -335,7 +358,7 @@ static void zlog_structure (Z_RPNStructure *zs, int depth,
                      *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;
@@ -353,16 +376,16 @@ static void zlog_structure (Z_RPNStructure *zs, int depth,
             {
             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, "");
@@ -375,7 +398,7 @@ static void zlog_structure (Z_RPNStructure *zs, int 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, "");
@@ -384,59 +407,82 @@ static void zlog_structure (Z_RPNStructure *zs, int depth,
         yaz_log (loglevel, "%*.0s unknown structure", depth, "");
 }
 
-static void wrbuf_structure (WRBUF b, Z_RPNStructure *zs, enum oid_value ast)
+static void wrbuf_apt(WRBUF b, Z_AttributesPlusTerm *zapt)
 {
+    int num_attributes = zapt->attributes->num_attributes;
     int i;
+    for (i = 0; i<num_attributes; i++)
+        wrbuf_attr(b,zapt->attributes->attributes[i]);
+    
+    switch (zapt->term->which)
+    {
+    case Z_Term_general:
+        wrbuf_term(b, (const char *)zapt->term->u.general->buf,
+                   zapt->term->u.general->len);
+        break;
+    case Z_Term_characterString:
+        wrbuf_printf(b, "@term string ");
+        wrbuf_term (b, zapt->term->u.characterString,
+                    strlen(zapt->term->u.characterString));
+        break;
+    case Z_Term_numeric:
+        wrbuf_printf(b, "@term numeric %d ", *zapt->term->u.numeric);
+        break;
+    case Z_Term_null:
+        wrbuf_printf(b, "@term null x");
+        break;
+    default:
+        wrbuf_printf(b, "@term null unknown%d ", zapt->term->which);
+    }
+}
+    
+static void wrbuf_structure (WRBUF b, Z_RPNStructure *zs, enum oid_value ast)
+{
     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]);
+            if (!op->u.prox->exclusion)
+                wrbuf_putc(b, 'n');
+            else if (*op->u.prox->exclusion)
+                wrbuf_putc(b, '1');
+            else
+                wrbuf_putc(b, '0');
 
-            switch (zapt->term->which)
+            wrbuf_printf(b, " %d %d %d ", *op->u.prox->distance,
+                         *op->u.prox->ordered,
+                         *op->u.prox->relationType);
+
+            switch(op->u.prox->which)
             {
-            case Z_Term_general:
-                wrbuf_printf(b, "'%.*s' ",
-			 zapt->term->u.general->len,
-			 zapt->term->u.general->buf);
+            case Z_ProximityOperator_known:
+                wrbuf_putc(b, 'k');
                 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) ");
+            case Z_ProximityOperator_private:
+                wrbuf_putc(b, 'p');
                 break;
             default:
-                wrbuf_printf(b, "(unknown term type %d) ", zapt->term->which);
+                wrbuf_printf(b, "%d", op->u.prox->which);
             }
+            if (op->u.prox->u.known)
+                wrbuf_printf(b, " %d ", *op->u.prox->u.known);
+            else
+                wrbuf_printf(b, " 0 ");
         }
+        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)
+            wrbuf_apt(b, zs->u.simple->u.attributesPlusTerm);
         else if (zs->u.simple->which == Z_Operand_resultSetId)
         {
-            wrbuf_printf(b, "@set '%s' ", zs->u.simple->u.resultSetId);
+            wrbuf_printf(b, "@set ");
+            wrbuf_term(b, zs->u.simple->u.resultSetId,
+                       strlen(zs->u.simple->u.resultSetId));
         }
         else
             wrbuf_printf (b, "(unknown simple structure)");
@@ -454,12 +500,12 @@ void log_rpn_query_level (int loglevel, Z_RPNQuery *rpn)
     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);
 }
@@ -473,12 +519,12 @@ static void wrbuf_rpn_query(WRBUF b, Z_RPNQuery *rpn)
     if (attrset)
     {
         ast = attrset->value;
-	wrbuf_printf(b, " @attrset %s ", attrset->desc);
+        wrbuf_printf(b, " @attrset %s ", attrset->desc);
     } 
     else
     {
-	ast = VAL_NONE;
-	wrbuf_printf (b, "Unknown:");
+        ast = VAL_NONE;
+        wrbuf_printf (b, "Unknown:");
     }
     wrbuf_structure (b,rpn->RPNStructure, ast);
 
@@ -486,7 +532,7 @@ static void wrbuf_rpn_query(WRBUF b, Z_RPNQuery *rpn)
 
 void log_rpn_query (Z_RPNQuery *rpn)
 {
-    log_rpn_query_level(LOG_LOG, rpn);
+    log_rpn_query_level(YLOG_LOG, rpn);
 }
 
 void log_scan_term_level (int loglevel, 
@@ -497,33 +543,22 @@ void log_scan_term_level (int 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)
 {
-    log_scan_term_level (LOG_LOG, zapt, ast);
+    log_scan_term_level (YLOG_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)");
+    wrbuf_apt(b, zapt);
 }
 
 void yaz_log_zquery_level (int loglevel, Z_Query *q)
@@ -533,15 +568,15 @@ 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);
@@ -550,7 +585,7 @@ void yaz_log_zquery_level (int loglevel, Z_Query *q)
 
 void yaz_log_zquery (Z_Query *q)
 {
-    yaz_log_zquery_level(LOG_LOG,q);
+    yaz_log_zquery_level(YLOG_LOG,q);
 }
 
 void wrbuf_put_zquery(WRBUF b, Z_Query *q)
@@ -559,23 +594,23 @@ void wrbuf_put_zquery(WRBUF b, Z_Query *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);
+    case Z_Query_type_1: 
+    case Z_Query_type_101:
+        wrbuf_printf(b,"RPN:");
+        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);
     }
 }
 
@@ -598,3 +633,11 @@ 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
+ */
+