X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_cons.c;h=1ae66c167ab70703fe685abda06bc18fd4e9070d;hp=1922aa04ea1f2a3e510084362e7a8f5ec1421b0f;hb=63cafe41a93427118959a74201b3e331169a71d9;hpb=aa82967af8f06004b567ad1ed40c67b056c44e7b

diff --git a/odr/odr_cons.c b/odr/odr_cons.c
index 1922aa0..1ae66c1 100644
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -1,10 +1,27 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $
- * Revision 1.10  1995-04-18 08:15:21  quinn
+ * Revision 1.15  1995-09-29 17:12:23  quinn
+ * Smallish
+ *
+ * Revision 1.14  1995/09/27  15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * 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.
+ *
+ * Revision 1.11  1995/05/16  08:50:53  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.10  1995/04/18  08:15:21  quinn
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
@@ -38,6 +55,7 @@
  */
 
 #include <odr.h>
+#include <assert.h>
 
 int odr_constructed_begin(ODR o, void *p, int class, int tag)
 {
@@ -66,7 +84,7 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag)
 #ifdef ODR_DEBUG
     fprintf(stderr, "[cons_begin(%d)]", o->stackp);
 #endif
-    if (o->direction == ODR_ENCODE || o->direction == ODR_PRINT)
+    if (o->direction == ODR_ENCODE)
     {
 	o->stack[o->stackp].lenlen = 1;
 	if (odr_putc(o, 0) < 0)     /* dummy */
@@ -80,8 +98,16 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag)
 	o->bp += res;
 	o->left -= res;
     }
-    else return 0;
-
+    else if (o->direction == ODR_PRINT)
+    {
+    	fprintf(o->print, "%s{\n", odr_indent(o));
+	o->indent++;
+    }
+    else
+    {
+    	o->error = OOTHER;
+	return 0;
+    }
     o->stack[o->stackp].base = o->bp;
     o->stack[o->stackp].base_offset = odr_tell(o);
     return 1;
@@ -131,7 +157,7 @@ int odr_constructed_end(ODR o)
 	    else if (o->bp - o->stack[o->stackp].base !=
 		o->stack[o->stackp].len)
 	    {
-	    	o->error = OOTHER;
+	    	o->error = OCONLEN;
 	    	return 0;
 	    }
 	    o->stackp--;
@@ -159,7 +185,12 @@ int odr_constructed_end(ODR o)
 #endif
 	    o->stackp--;
 	    return 1;
-    	case ODR_PRINT: o->stackp--;  return 1;
+    	case ODR_PRINT:
+	    assert(o->indent > 0);
+	    o->stackp--;
+	    o->indent--;
+	    fprintf(o->print, "%s}\n", odr_indent(o));
+	    return 1;
     	default:
 	    o->error = OOTHER;
 	    return 0;