Fix sample PQF

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

diff --git a/odr/odr_use.c b/odr/odr_use.c
index 2ac7ab2..918d69d 100644 (file)
--- a/odr/odr_use.c
+++ b/odr/odr_use.c
@@ -1,43 +1,15 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: odr_use.c,v $
- * Revision 1.10  1999-11-30 13:47:12  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.9  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.8  1998/02/11 11:53:34  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.7  1995/09/29 17:12:27  quinn
- * Smallish
- *
- * Revision 1.6  1995/09/27  15:03:00  quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.5  1995/08/10  08:54:47  quinn
- * Added Explain.
- *
- * Revision 1.4  1995/06/16  13:16:12  quinn
- * Fixed Defaultdiagformat.
- *
- * Revision 1.3  1995/05/16  08:51:00  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.2  1995/02/09  15:51:50  quinn
- * Works better now.
- *
- * Revision 1.1  1995/02/03  17:04:39  quinn
- * Initial revision
- *
+ * $Id: odr_use.c,v 1.14 2003-05-20 19:55:30 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <yaz/odr.h>
+#include "odr-priv.h"
 
 int odr_external(ODR o, Odr_external **p, int opt, const char *name)
 {
@@ -55,7 +27,7 @@ int odr_external(ODR o, Odr_external **p, int opt, const char *name)
 
     odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL);
     if (!odr_sequence_begin(o, p, sizeof(Odr_external), name))
-       return opt;
+       return odr_missing(o, opt, name);
     pp = *p;
     return
        odr_oid(o, &pp->direct_reference, 1, "direct") &&
@@ -77,7 +49,7 @@ int odr_visiblestring(ODR o, char **p, int opt, const char *name)
  */
 int odr_generalstring(ODR o, char **p, int opt, const char *name)
 {
-    return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
+    return odr_implicit_tag(o, odr_iconv_string, p, ODR_UNIVERSAL,
                            ODR_GENERALSTRING,opt, name);
 }