X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Fgduutil.cpp;h=9b1ae5ac1679d3f2fc981e85f16650cb13c49ac2;hb=637a685d61a9ff0e3f398a59da426979815c4d68;hp=eb7e18c51907cb5b5b5ca8b0fb1b76798d0d7c2f;hpb=2f8cb1e1bda27debbd84f233453d33c8ff0700fc;p=metaproxy-moved-to-github.git

diff --git a/src/gduutil.cpp b/src/gduutil.cpp
index eb7e18c..9b1ae5a 100644
--- a/src/gduutil.cpp
+++ b/src/gduutil.cpp
@@ -1,13 +1,29 @@
-/* $Id: gduutil.cpp,v 1.19 2007-04-10 11:28:51 marc Exp $
+/* $Id: gduutil.cpp,v 1.21 2007-05-09 21:23:09 adam Exp $
    Copyright (c) 2005-2007, Index Data.
 
-   See the LICENSE file for details
-*/
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+ */
 
 #include "gduutil.hpp"
 #include "util.hpp"
 
 #include <yaz/wrbuf.h>
+#include <yaz/oid_db.h>
 #include <yaz/querytowrbuf.h>
 
 #include <iostream>
@@ -241,8 +257,13 @@ std::ostream& std::operator<<(std::ostream& os,  Z_APDU& zapdu)
             else
                 os << " -";
             if (pr->preferredRecordSyntax)
-                //os << " " << pr->preferredRecordSyntax;
-                os << " " <<(oid_getentbyoid(pr->preferredRecordSyntax))->desc;
+            {
+                char oid_name_str[OID_STR_MAX];
+                const char *oid_name = yaz_oid_to_string_buf(
+                    pr->preferredRecordSyntax, 0, oid_name_str);
+                    
+                os << " " << oid_name;
+            }
             else
                 os << " -";
             const char * msg = 0;
@@ -343,7 +364,8 @@ std::ostream& std::operator<<(std::ostream& os,  Z_APDU& zapdu)
                 if (sr->termListAndStartPoint)
                 {
                     WRBUF wr = wrbuf_alloc();
-                    yaz_scan_to_wrbuf(wr, sr->termListAndStartPoint, VAL_NONE);
+                    yaz_scan_to_wrbuf(wr, sr->termListAndStartPoint, 
+                                      sr->attributeSet);
                     os << wrbuf_cstr(wr);
                     wrbuf_destroy(wr);
                 }