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

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

diff --git a/odr/odr_enum.c b/odr/odr_enum.c
index 078593d..5fcc29b 100644 (file)
--- a/odr/odr_enum.c
+++ b/odr/odr_enum.c
@@ -1,22 +1,37 @@
 /*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_enum.c,v $
- * Revision 1.1  1998-03-20 14:45:01  adam
+ * Revision 1.5  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.4  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.3  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.2  1999/01/08 11:23:27  adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.1  1998/03/20 14:45:01  adam
  * Implemented odr_enum and odr_set_of.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
-#include <prt.h>
+#include <yaz/odr.h>
 
 /*
  * Top level enum en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_enum(ODR o, int **p, int opt)
+int odr_enum(ODR o, int **p, int opt, const char *name)
 {
     int res, cons = 0;
 
@@ -33,7 +48,8 @@ int odr_enum(ODR o, int **p, int opt)
         return opt;
     if (o->direction == ODR_PRINT)
     {
-        fprintf(o->print, "%s%d\n", odr_indent(o), **p);
+       odr_prname(o, name);
+        fprintf(o->print, "%d\n", **p);
         return 1;
     }
     if (cons)