Update headers and omit CVS Ids.

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

diff --git a/src/grs1disp.c b/src/grs1disp.c
index c2abea8..dc5a5bd 100644 (file)
--- a/src/grs1disp.c
+++ b/src/grs1disp.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: grs1disp.c,v 1.3 2005-01-15 19:47:13 adam Exp $
  */
 
 /**
@@ -16,6 +14,7 @@
 #include <ctype.h>
 
 #include <yaz/proto.h>
+#include <yaz/oid_db.h>
 
 static void display_variant(WRBUF w, Z_Variant *v, int level)
 {
@@ -66,22 +65,27 @@ static void display_grs1(WRBUF w, Z_GenericRecord *r, int level)
             }
         }
         else if (t->content->which == Z_ElementData_string)
-            wrbuf_printf(w, "%s\n", t->content->u.string);
+        {
+            wrbuf_puts(w, t->content->u.string);
+            wrbuf_puts(w, "\n");
+        }
         else if (t->content->which == Z_ElementData_numeric)
+        {
             wrbuf_printf(w, "%d\n", *t->content->u.numeric);
+        }
         else if (t->content->which == Z_ElementData_oid)
         {
-            int *ip = t->content->u.oid;
-            oident *oent;
-            
-            if ((oent = oid_getentbyoid(t->content->u.oid)))
-                wrbuf_printf(w, "OID: %s\n", oent->desc);
-            else
+            Odr_oid *ip = t->content->u.oid;
+
+            if (ip)
             {
-                wrbuf_printf(w, "{");
-                while (ip && *ip >= 0)
-                    wrbuf_printf(w, " %d", *(ip++));
-                wrbuf_printf(w, " }\n");
+                char oid_name_str[OID_STR_MAX];
+                oid_class oclass;
+                const char *oid_name 
+                    = yaz_oid_to_string_buf(ip, &oclass, oid_name_str);
+            
+                if (oid_name)
+                    wrbuf_printf(w, "OID: %s\n", oid_name);
             }
         }
         else if (t->content->which == Z_ElementData_noDataRequested)
@@ -120,3 +124,11 @@ void yaz_display_grs1(WRBUF wrbuf, Z_GenericRecord *r, int flags)
     display_grs1 (wrbuf, r, 0);
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+