CCL: fix use of "term" field in sub queries

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

diff --git a/src/odr_use.c b/src/odr_use.c
index 1077254..f435563 100644 (file)
--- a/src/odr_use.c
+++ b/src/odr_use.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_use.c,v 1.3 2005-01-15 19:47:14 adam Exp $
  */
 /**
  * \file odr_use.c
@@ -19,31 +17,31 @@ int odr_external(ODR o, Odr_external **p, int opt, const char *name)
     Odr_external *pp;
     static Odr_arm arm[] =
     {
-       {ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, 
-        (Odr_fun)odr_any, "single"},
-       {ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet,
-        (Odr_fun)odr_octetstring, "octet"},
-       {ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary,
-        (Odr_fun)odr_bitstring, "arbitrary"},
-       {-1, -1, -1, -1, 0, 0}
+        {ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, 
+         (Odr_fun)odr_any, "single"},
+        {ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet,
+         (Odr_fun)odr_octetstring, "octet"},
+        {ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary,
+         (Odr_fun)odr_bitstring, "arbitrary"},
+        {-1, -1, -1, -1, 0, 0}
     };
 
     odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL);
     if (!odr_sequence_begin(o, p, sizeof(Odr_external), name))
-       return odr_missing(o, opt, name);
+        return odr_missing(o, opt, name);
     pp = *p;
     return
-       odr_oid(o, &pp->direct_reference, 1, "direct") &&
-       odr_integer(o, &pp->indirect_reference, 1, "indirect") &&
-       odr_graphicstring(o, &pp->descriptor, 1, "descriptor") &&
-       odr_choice(o, arm, &pp->u, &pp->which, 0) &&
-       odr_sequence_end(o);
+        odr_oid(o, &pp->direct_reference, 1, "direct") &&
+        odr_integer(o, &pp->indirect_reference, 1, "indirect") &&
+        odr_graphicstring(o, &pp->descriptor, 1, "descriptor") &&
+        odr_choice(o, arm, &pp->u, &pp->which, 0) &&
+        odr_sequence_end(o);
 }
 
 int odr_visiblestring(ODR o, char **p, int opt, const char *name)
 {
     return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
-                           ODR_VISIBLESTRING, opt, name);
+                            ODR_VISIBLESTRING, opt, name);
 }    
 
 /*
@@ -53,17 +51,26 @@ 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_iconv_string, p, ODR_UNIVERSAL,
-                           ODR_GENERALSTRING,opt, name);
+                            ODR_GENERALSTRING,opt, name);
 }    
 
 int odr_graphicstring(ODR o, char **p, int opt, const char *name)
 {
     return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
-                       ODR_GRAPHICSTRING, opt, name);
+                        ODR_GRAPHICSTRING, opt, name);
 }    
 
 int odr_generalizedtime(ODR o, char **p, int opt, const char *name)
 {
     return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL,
-                           ODR_GENERALIZEDTIME, opt, name);
+                            ODR_GENERALIZEDTIME, opt, name);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+