Year 2007.

[metaproxy-moved-to-github.git] / src / gduutil.cpp

diff --git a/src/gduutil.cpp b/src/gduutil.cpp
index c17d98c..4d02d2d 100644 (file)
--- a/src/gduutil.cpp
+++ b/src/gduutil.cpp
@@ -1,5 +1,5 @@
-/* $Id: gduutil.cpp,v 1.8 2006-09-18 10:25:00 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: gduutil.cpp,v 1.17 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
    See the LICENSE file for details
 */
@@ -16,7 +16,10 @@
 namespace mp = metaproxy_1;
 
 // Doxygen doesn't like mp::gdu, so we use this instead
-namespace mp_gdu = metaproxy_1::gdu;
+namespace mp_util = metaproxy_1::util;
+
+
+
 
 std::ostream& std::operator<<(std::ostream& os,  Z_GDU& zgdu)
 {
@@ -213,13 +216,33 @@ std::ostream& std::operator<<(std::ostream& os,  Z_APDU& zapdu)
         }
         break;
     case Z_APDU_presentRequest:
-        os << " " << "presentRequest" << " ";
+        os << " " << "presentRequest";
         {
             Z_PresentRequest *pr = zapdu.u.presentRequest;
-            os << pr->resultSetId << " "
-                //<< pr->referenceId << " "
-               << *(pr->resultSetStartPoint) << " "
-               << *(pr->numberOfRecordsRequested);
+            if (pr->resultSetId)
+                os << " " << (pr->resultSetId);
+            else
+                os << " -";
+            //<< pr->referenceId << " "
+            if (pr->resultSetStartPoint)
+                os << " " << *(pr->resultSetStartPoint);
+            else
+                os << " -";
+            if (pr->numberOfRecordsRequested)
+                os << " " << *(pr->numberOfRecordsRequested);
+            else
+                os << " -";
+            if (pr->preferredRecordSyntax)
+                //os << " " << pr->preferredRecordSyntax;
+                os << " " <<(oid_getentbyoid(pr->preferredRecordSyntax))->desc;
+            else
+                os << " -";
+            const char * msg = 0;
+            if (pr->recordComposition 
+                && (msg = mp_util::record_composition_to_esn(pr->recordComposition)))
+                os << " " << msg;
+            else
+                os << " -";
         }
         break;
     case Z_APDU_presentResponse:
@@ -539,6 +562,8 @@ std::ostream& std::operator<<(std::ostream& os,  Z_APDU& zapdu)
 }
 
 
+
+
 /*
  * Local variables:
  * c-basic-offset: 4