X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzlogs.c;h=04b15d32278b8c94c79db0d45482e7c3d021f745;hb=d0fa45cf0b317b7332a097928dc3c8827536a97d;hp=e74178bf117342ed013b9f2cbc31e8ab84de8232;hpb=9b426aeb9256cef844693c13f38aba4b10f7056d;p=idzebra-moved-to-github.git

diff --git a/index/zlogs.c b/index/zlogs.c
index e74178b..04b15d3 100644
--- a/index/zlogs.c
+++ b/index/zlogs.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1995-1998, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zlogs.c,v $
- * Revision 1.5  1997-04-30 08:56:07  quinn
+ * Revision 1.9  1998-10-13 20:36:02  adam
+ * Changed "indent" format string in log messages.
+ *
+ * Revision 1.8  1998/04/02 14:35:29  adam
+ * First version of Zebra that works with compiled ASN.1.
+ *
+ * Revision 1.7  1998/01/29 13:40:11  adam
+ * Better logging for scan service.
+ *
+ * Revision 1.6  1997/09/29 09:06:41  adam
+ * Removed static var to make this module thread safe.
+ *
+ * Revision 1.5  1997/04/30 08:56:07  quinn
  * null
  *
  * Revision 1.4  1996/10/08  09:41:25  quinn
@@ -27,10 +39,8 @@
 
 #include "zserver.h"
 
-static char *attrStr (int type, int value, enum oid_value ast)
+static void attrStr (int type, int value, enum oid_value ast, char *str)
 {
-    static char str[80];
-
     *str = '\0';
     switch (ast)
     {
@@ -203,7 +213,6 @@ static char *attrStr (int type, int value, enum oid_value ast)
         sprintf (str + strlen(str), " (%d=%d)", type, value);
     else
         sprintf (str, "%d=%d", type, value);
-    return str;
 }
 
 /*
@@ -213,29 +222,41 @@ static void zlog_attributes (Z_AttributesPlusTerm *t, int level,
                              enum oid_value ast)
 {
     int of, i;
-    for (of = 0; of < t->num_attributes; of++)
+    char str[80];
+#ifdef ASN_COMPILED
+    int num_attributes = t->attributes->num_attributes;
+#else
+    int num_attributes = t->num_attributes;
+#endif
+    
+    for (of = 0; of < num_attributes; of++)
     {
         Z_AttributeElement *element;
+#ifdef ASN_COMPILED
+	element = t->attributes->attributes[of];
+#else
         element = t->attributeList[of];
+#endif
 
         switch (element->which) 
         {
         case Z_AttributeValue_numeric:
-            logf (LOG_LOG, "%*.s %s", level, "",
-                  attrStr (*element->attributeType, *element->value.numeric, ast));
+	    attrStr (*element->attributeType,
+		     *element->value.numeric, ast, str);
+            logf (LOG_LOG, "%*.0s %s", level, "", str);
             break;
         case Z_AttributeValue_complex:
-            logf (LOG_LOG, "%*.s attributeType=%d complex", level, "",
+            logf (LOG_LOG, "%*.0s attributeType=%d complex", level, "",
                   *element->attributeType);
             for (i = 0; i<element->value.complex->num_list; i++)
             {
                 if (element->value.complex->list[i]->which ==
                     Z_StringOrNumeric_string)
-                    logf (LOG_LOG, "%*.s  string: '%s'", level, "",
+                    logf (LOG_LOG, "%*.0s  string: '%s'", level, "",
                           element->value.complex->list[i]->u.string);
                 else if (element->value.complex->list[i]->which ==
                          Z_StringOrNumeric_numeric)
-                    logf (LOG_LOG, "%*.s  numeric: '%d'", level, "",
+                    logf (LOG_LOG, "%*.0s  numeric: '%d'", level, "",
                           *element->value.complex->list[i]->u.numeric);
             }
             break;
@@ -252,16 +273,16 @@ static void zlog_structure (Z_RPNStructure *zs, int level, enum oid_value ast)
         switch (zs->u.complex->roperator->which)
         {
         case Z_Operator_and:
-            logf (LOG_LOG, "%*.s and", level, "");
+            logf (LOG_LOG, "%*.0s and", level, "");
             break;
         case Z_Operator_or:
-            logf (LOG_LOG, "%*.s or", level, "");
+            logf (LOG_LOG, "%*.0s or", level, "");
             break;
         case Z_Operator_and_not:
-            logf (LOG_LOG, "%*.s and-not", level, "");
+            logf (LOG_LOG, "%*.0s and-not", level, "");
             break;
         default:
-            logf (LOG_LOG, "%*.s unknown complex", level, "");
+            logf (LOG_LOG, "%*.0s unknown complex", level, "");
             return;
         }
         zlog_structure (zs->u.complex->s1, level+2, ast);
@@ -275,33 +296,55 @@ static void zlog_structure (Z_RPNStructure *zs, int level, enum oid_value ast)
 
             if (zapt->term->which == Z_Term_general) 
             {
-                logf (LOG_LOG, "%*.s term '%.*s' (general)", level, "",
+                logf (LOG_LOG, "%*.0s term '%.*s' (general)", level, "",
                       zapt->term->u.general->len, zapt->term->u.general->buf);
             }
             else
             {
-                logf (LOG_LOG, "%*.s term (not general)", level, "");
+                logf (LOG_LOG, "%*.0s term (not general)", level, "");
             }
             zlog_attributes (zapt, level+2, ast);
         }
         else if (zs->u.simple->which == Z_Operand_resultSetId)
         {
-            logf (LOG_LOG, "%*.s set '%s'", level, "",
+            logf (LOG_LOG, "%*.0s set '%s'", level, "",
                   zs->u.simple->u.resultSetId);
         }
         else
-            logf (LOG_LOG, "%*.s unknown simple structure", level, "");
+            logf (LOG_LOG, "%*.0s unknown simple structure", level, "");
     }
     else
-        logf (LOG_LOG, "%*.s unknown structure", level, "");
+        logf (LOG_LOG, "%*.0s unknown structure", level, "");
 }
 
 void zlog_rpn (Z_RPNQuery *rpn)
 {
-    oident *attrset = oid_getentbyoid (rpn->attributeSetId);
+    oident *attrset;
     enum oid_value ast;
-
-    ast = attrset->value;
-    logf (LOG_LOG, "RPN query. Type: %s", attrset->desc);
+    
+    attrset = oid_getentbyoid (rpn->attributeSetId);
+    if (attrset)
+    {
+        ast = attrset->value;
+	logf (LOG_LOG, "RPN query. Type: %s", attrset->desc);
+    } 
+    else
+    {
+	ast = VAL_NONE;
+	logf (LOG_LOG, "RPN query. Unknown type");
+    }
     zlog_structure (rpn->RPNStructure, 0, ast);
 }
+
+void zlog_scan (Z_AttributesPlusTerm *zapt, oid_value ast)
+{
+    int level = 0;
+    if (zapt->term->which == Z_Term_general) 
+    {
+	logf (LOG_LOG, "%*.0s term '%.*s' (general)", level, "",
+	      zapt->term->u.general->len, zapt->term->u.general->buf);
+    }
+    else
+	logf (LOG_LOG, "%*.0s term (not general)", level, "");
+    zlog_attributes (zapt, level+2, ast);
+}