X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oct.c;h=7fd03f88dd2c6f9ae3d116f6c786477b3681a1a3;hb=9a13337111b32d256182a4248f93ebe26e393059;hp=5598e4cc791b02d32c209465f058bd862dbc0baa;hpb=e147ddf129696b470aed3cfcdb405af84ee56ef6;p=yaz-moved-to-github.git

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index 5598e4c..7fd03f8 100644
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_oct.c,v $
- * Revision 1.13  1999-04-20 09:56:48  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/10/19 12:35:55  adam
+ * Better dump of OCTET STRING.
+ *
+ * Revision 1.13  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.
  *
@@ -45,8 +54,11 @@
  * First kick.
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <odr.h>
+#include <yaz/odr.h>
 
 /*
  * Top level octet string en/decoder.
@@ -69,8 +81,19 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
     	return opt;
     if (o->direction == ODR_PRINT)
     {
+        int i;
 	odr_prname(o, name);
-    	fprintf(o->print, "OCTETSTRING(len=%d)\n", (*p)->len);
+    	fprintf(o->print, "OCTETSTRING(len=%d)", (*p)->len);
+        for (i = 0; i<(*p)->len; i++)
+        {
+	    if (i < 5 || i > ((*p)->len - 4))
+            {
+                fprintf (o->print, " %02X", (*p)->buf[i]);
+            }
+            else if (i == 5)
+                fprintf (o->print, " .. ");
+        }
+        fprintf(o->print, "\n");
     	return 1;
     }
     if (o->direction == ODR_DECODE)