/*
- * 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.14 1995-09-27 15:02:58 quinn
+ * 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
+ * Various smaller things. Gathered header-files.
+ *
+ * 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.
* First kick.
*
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <yaz/odr.h>
-#include <odr.h>
-#include <assert.h>
+void odr_setlenlen(ODR o, int len)
+{
+ o->lenlen = len;
+}
-int MDF 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;
+ int lenlen = o->lenlen;
if (o->error)
return 0;
+ 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)
#endif
if (o->direction == ODR_ENCODE)
{
- o->stack[o->stackp].lenlen = 1;
- if (odr_putc(o, 0) < 0) /* dummy */
+ static unsigned char dummy[sizeof(int)+1];
+
+ o->stack[o->stackp].lenlen = lenlen;
+
+ if (odr_write(o, dummy, lenlen) < 0) /* dummy */
return 0;
}
else if (o->direction == ODR_DECODE)
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
return 1;
}
-int MDF odr_constructed_more(ODR o)
+int odr_constructed_more(ODR o)
{
if (o->error)
return 0;
return (!(*o->bp == 0 && *(o->bp + 1) == 0));
}
-int MDF odr_constructed_end(ODR o)
+int odr_constructed_end(ODR o)
{
int res;
int pos;
{
if (*o->bp++ == 0 && *(o->bp++) == 0)
{
- o->left -= 2;
o->stackp--;
return 1;
}
odr_seek(o, ODR_S_SET, o->stack[o->stackp].len_offset);
if ((res = ber_enclen(o, pos - o->stack[o->stackp].base_offset,
o->stack[o->stackp].lenlen, 1)) < 0)
+ {
+ o->error = OLENOV;
return 0;
+ }
odr_seek(o, ODR_S_END, 0);
if (res == 0) /* indefinite encoding */
{
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;