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

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

diff --git a/odr/odr_oid.c b/odr/odr_oid.c
index 0feae2e..7e7e1b8 100644 (file)
--- a/odr/odr_oid.c
+++ b/odr/odr_oid.c
@@ -1,10 +1,20 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oid.c,v $
- * Revision 1.13  1998-02-11 11:53:34  adam
+ * Revision 1.16  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.15  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.14  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.13  1998/02/11 11:53:34  adam
  * Changed code so that it compiles as C++.
  *
  * Revision 1.12  1995/09/29 17:12:25  quinn
@@ -45,15 +55,18 @@
  *
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
-#include <oid.h>
+#include <yaz/odr.h>
+#include <yaz/oid.h>
 
 /*
  * Top level oid en/decoder.
  * Returns 1 on success, 0 on error.
  */
-int odr_oid(ODR o, Odr_oid **p, int opt)
+int odr_oid(ODR o, Odr_oid **p, int opt, const char *name)
 {
     int res, cons = 0;
 
@@ -77,7 +90,8 @@ int odr_oid(ODR o, Odr_oid **p, int opt)
     {
        int i;
 
-       fprintf(o->print, "%sOID:", odr_indent(o));
+       odr_prname(o, name);
+       fprintf(o->print, "OID:");
        for (i = 0; (*p)[i] > -1; i++)
            fprintf(o->print, " %d", (*p)[i]);
        fprintf(o->print, "\n");