Directive s=pw sets structure to phrase if term includes blank(s).

[yaz-moved-to-github.git] / odr / odr_cons.c

diff --git a/odr/odr_cons.c b/odr/odr_cons.c
index 70dab2d..c74229c 100644 (file)
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -1,10 +1,27 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $
- * Revision 1.17  1996-10-23 12:31:24  adam
+ * Revision 1.22  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.21  2000/01/31 13:15:21  adam
+ * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
+ * that some characters are not surrounded by spaces in resulting term.
+ * ILL-code updates.
+ *
+ * Revision 1.20  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.19  1999/04/20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.18  1997/05/14 06:53:58  adam
+ * C++ support.
+ *
+ * Revision 1.17  1996/10/23 12:31:24  adam
  * Added 'static' modifier to dummy variable in odr_constructed_begin.
  *
  * Revision 1.16  1996/07/26  13:38:20  quinn
@@ -18,8 +35,6 @@
  *
  * Revision 1.13  1995/08/15  11:16:39  quinn
  * Fixed pretty-printers.
- * CV:e ----------------------------------------------------------------------
- * CV:e ----------------------------------------------------------------------
  *
  * Revision 1.12  1995/06/19  12:38:47  quinn
  * Added BER dumper.
@@ -59,16 +74,19 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
-#include <assert.h>
+#include <yaz/odr.h>
 
 void odr_setlenlen(ODR o, int len)
 {
     o->lenlen = len;
 }
 
-int odr_constructed_begin(ODR o, void *p, int class, int tag)
+int odr_constructed_begin(ODR o, void *p, int zclass, int tag,
+                         const char *name)
 {
     int res;
     int cons = 1;
@@ -79,7 +97,7 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag)
     o->lenlen = 1; /* reset lenlen */
     if (o->t_class < 0)
     {
-       o->t_class = class;
+       o->t_class = zclass;
        o->t_tag = tag;
     }
     if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, 1)) < 0)
@@ -112,11 +130,11 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag)
            return 0;
        o->stack[o->stackp].lenlen = res;
        o->bp += res;
-       o->left -= res;
     }
     else if (o->direction == ODR_PRINT)
     {
-       fprintf(o->print, "%s{\n", odr_indent(o));
+       odr_prname(o, name);
+       fprintf(o->print, "{\n");
        o->indent++;
     }
     else
@@ -160,7 +178,6 @@ int odr_constructed_end(ODR o)
            {
                if (*o->bp++ == 0 && *(o->bp++) == 0)
                {
-                   o->left -= 2;
                    o->stackp--;
                    return 1;
                }
@@ -205,10 +222,10 @@ int odr_constructed_end(ODR o)
            o->stackp--;
            return 1;
        case ODR_PRINT:
-           assert(o->indent > 0);
            o->stackp--;
            o->indent--;
-           fprintf(o->print, "%s}\n", odr_indent(o));
+           odr_prname(o, 0);
+           fprintf(o->print, "}\n");
            return 1;
        default:
            o->error = OOTHER;