Expanded tabs in all source files. Added vim/emacs local variables

[yaz-moved-to-github.git] / src / logrpn.c

diff --git a/src/logrpn.c b/src/logrpn.c
index 7baa3aa..39e9893 100644 (file)
--- a/src/logrpn.c
+++ b/src/logrpn.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * All rights reserved.
  *
- * $Id: logrpn.c,v 1.10 2005-01-15 19:47:13 adam Exp $
+ * $Id: logrpn.c,v 1.11 2005-06-25 15:46:04 adam Exp $
  */
 
 /**
@@ -190,20 +190,20 @@ 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 (strchr(" \"{", term[i]))
+            break;
     if (i == len && i)
-       wrbuf_printf(b, "%.*s ", len, term);
+        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, "\" ");
+        wrbuf_putc(b, '"');
+        for (i = 0; i<len; i++)
+        {
+            if (term[i] == '"')
+                wrbuf_putc(b, '\\');
+            wrbuf_putc(b, term[i]);
+        }
+        wrbuf_printf(b, "\" ");
     }
 }
 
@@ -222,29 +222,29 @@ static void wrbuf_attr(WRBUF b, Z_AttributeElement *element)
     switch (element->which) 
     {
     case Z_AttributeValue_numeric:
-       wrbuf_printf(b,"@attr %s%s%d=%d ", setname, sep,
-                    *element->attributeType, *element->value.numeric);
-       break;
+        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;
+        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 ");
+        wrbuf_printf (b, "@attr 1=unknown ");
     }
 }
 
@@ -260,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);
         }
     }
 }
@@ -303,15 +303,15 @@ static char *complex_op_name(Z_Operator *op)
     switch (op->which)
     {
     case Z_Operator_and:
-       return "and";
+        return "and";
     case Z_Operator_or:
-       return "or";
+        return "or";
     case Z_Operator_and_not:
-       return "not";
+        return "not";
     case Z_Operator_prox:
-       return "prox";
+        return "prox";
     default:
-       return "unknown complex operator";
+        return "unknown complex operator";
     }
 }
 
@@ -349,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 ?
@@ -358,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;
@@ -376,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, "");
@@ -398,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, "");
@@ -412,27 +412,27 @@ 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]);
+        wrbuf_attr(b,zapt->attributes->attributes[i]);
     
     switch (zapt->term->which)
     {
     case Z_Term_general:
-       wrbuf_term(b, zapt->term->u.general->buf,
-                  zapt->term->u.general->len);
-       break;
+        wrbuf_term(b, 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;
+        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;
+        wrbuf_printf(b, "@term numeric %d ", *zapt->term->u.numeric);
+        break;
     case Z_Term_null:
-       wrbuf_printf(b, "@term null x");
-       break;
+        wrbuf_printf(b, "@term null x");
+        break;
     default:
-       wrbuf_printf(b, "@term null unknown%d ", zapt->term->which);
+        wrbuf_printf(b, "@term null unknown%d ", zapt->term->which);
     }
 }
     
@@ -444,32 +444,32 @@ static void wrbuf_structure (WRBUF b, Z_RPNStructure *zs, enum oid_value ast)
         wrbuf_printf(b, "@%s ", complex_op_name(op) );
         if (op->which== Z_Operator_prox)
         {
-           if (!op->u.prox->exclusion)
-               wrbuf_putc(b, 'n');
-           else if (*op->u.prox->exclusion)
-               wrbuf_putc(b, '1');
-           else
-               wrbuf_putc(b, '0');
+            if (!op->u.prox->exclusion)
+                wrbuf_putc(b, 'n');
+            else if (*op->u.prox->exclusion)
+                wrbuf_putc(b, '1');
+            else
+                wrbuf_putc(b, '0');
 
-           wrbuf_printf(b, " %d %d %d ", *op->u.prox->distance,
-                        *op->u.prox->ordered,
-                        *op->u.prox->relationType);
+            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_ProximityOperator_known:
-               wrbuf_putc(b, 'k');
-               break;
-           case Z_ProximityOperator_private:
-               wrbuf_putc(b, 'p');
-               break;
-           default:
-               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 ");
+            switch(op->u.prox->which)
+            {
+            case Z_ProximityOperator_known:
+                wrbuf_putc(b, 'k');
+                break;
+            case Z_ProximityOperator_private:
+                wrbuf_putc(b, 'p');
+                break;
+            default:
+                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);
@@ -477,12 +477,12 @@ static void wrbuf_structure (WRBUF b, Z_RPNStructure *zs, enum oid_value ast)
     else if (zs->which == Z_RPNStructure_simple)
     {
         if (zs->u.simple->which == Z_Operand_APT)
-           wrbuf_apt(b, zs->u.simple->u.attributesPlusTerm);
+            wrbuf_apt(b, zs->u.simple->u.attributesPlusTerm);
         else if (zs->u.simple->which == Z_Operand_resultSetId)
         {
             wrbuf_printf(b, "@set ");
-           wrbuf_term(b, zs->u.simple->u.resultSetId,
-                      strlen(zs->u.simple->u.resultSetId));
+            wrbuf_term(b, zs->u.simple->u.resultSetId,
+                       strlen(zs->u.simple->u.resultSetId));
         }
         else
             wrbuf_printf (b, "(unknown simple structure)");
@@ -500,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);
 }
@@ -519,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);
 
@@ -543,11 +543,11 @@ 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);
 }
 
@@ -568,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);
@@ -596,21 +596,21 @@ void wrbuf_put_zquery(WRBUF b, Z_Query *q)
     {
     case Z_Query_type_1: 
     case Z_Query_type_101:
-       wrbuf_printf(b,"RPN:");
-       wrbuf_rpn_query(b,q->u.type_1);
-       break;
+        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;
+        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;
+        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);
+        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);
     }
 }
 
@@ -633,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
+ */
+