/*
- * 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.18 1997-05-14 06:53:58 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
*
* 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.
* 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 zclass, int tag)
+int odr_constructed_begin(ODR o, void *p, int zclass, int tag,
+ const char *name)
{
int res;
int cons = 1;
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
{
if (*o->bp++ == 0 && *(o->bp++) == 0)
{
- o->left -= 2;
o->stackp--;
return 1;
}
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;