Release 1.6.4

[yazpp-moved-to-github.git] / src / yaz-my-client.cpp

diff --git a/src/yaz-my-client.cpp b/src/yaz-my-client.cpp
index 5fc292d..f4879af 100644 (file)
--- a/src/yaz-my-client.cpp
+++ b/src/yaz-my-client.cpp
@@ -1,10 +1,11 @@
-/*
- * Copyright (c) 1998-2007, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) Index Data 
  * See the file LICENSE for details.
- * 
- * $Id: yaz-my-client.cpp,v 1.28 2007-04-16 21:54:23 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 #include <yaz/log.h>
 #include <yaz/options.h>
@@ -90,7 +91,7 @@ void MyClient::failNotify()
 
 IPDU_Observer *MyClient::sessionNotify(IPDU_Observable *the_PDU_Observable,
                                        int fd)
-{ 
+{
     return new MyClient(the_PDU_Observable, m_socketManager);
 }
 
@@ -116,7 +117,7 @@ char *MyClient::get_cookie(Z_OtherInformation **otherInfo)
     Z_OtherInformationUnit *oi =
         update_otherInformation(otherInfo, 0, yaz_oid_userinfo_cookie, 1, 1);
 
-    if (oi->which == Z_OtherInfo_characterInfo)
+    if (oi && oi->which == Z_OtherInfo_characterInfo)
         return oi->information.characterInfo;
     return 0;
 }
@@ -155,7 +156,7 @@ void MyClient::recv_diagrecs(Z_DiagRec **pp, int num)
         }
         else
             r = p->u.defaultFormat;
-             printf("    [%d] %s", *r->condition, diagbib1_str(*r->condition));
+             printf("    [" ODR_INT_PRINTF "] %s", *r->condition, diagbib1_str(*r->condition));
         switch (r->which)
         {
         case Z_DefaultDiagFormat_v2Addinfo:
@@ -192,7 +193,7 @@ void MyClient::recv_record(Z_DatabaseRecord *record, int offset,
     if (r->direct_reference)
     {
         char name_oid_str[OID_STR_MAX];
-        const char *name_oid = yaz_oid_to_string_buf(r->direct_reference, 0, 
+        const char *name_oid = yaz_oid_to_string_buf(r->direct_reference, 0,
                                                      name_oid_str);
         printf("Record type: %s\n", name_oid ? name_oid : "unknown");
     }
@@ -222,7 +223,7 @@ void MyClient::recv_record(Z_DatabaseRecord *record, int offset,
                         (size_t) r->u.sutrs->len);
     else if (r->which == Z_External_grs1)
         recv_genericRecord(r->u.grs1);
-    else 
+    else
     {
         printf("Unknown record representation.\n");
         if (!z_External(odr_print(), &r, 0, 0))
@@ -230,7 +231,7 @@ void MyClient::recv_record(Z_DatabaseRecord *record, int offset,
             odr_perror(odr_print(), "Printing external");
             odr_reset(odr_print());
         }
-    }    
+    }
 }
 
 void MyClient::recv_namePlusRecord (Z_NamePlusRecord *zpr, int offset)
@@ -279,7 +280,7 @@ void MyClient::recv_searchResponse(Z_SearchResponse *searchResponse)
     else
     {
         printf ("Ok\n");
-        printf ("Hits: %d\n", *searchResponse->resultCount);
+        printf ("Hits: " ODR_INT_PRINTF "\n", *searchResponse->resultCount);
     }
     recv_records (searchResponse->records);
 }
@@ -413,14 +414,14 @@ int MyClient::processCommand(const char *commandLine)
         {"proxy", &MyClient::cmd_proxy, "<host>:[':'<port>]"},
         {0,0,0}
     };
-    
+
     if (sscanf(commandLine, "%s %[^;]", cmdStr, cmdArgs) < 1)
         return 1;
     int i;
     for (i = 0; cmd[i].cmd; i++)
         if (!strncmp(cmd[i].cmd, cmdStr, strlen(cmdStr)))
             break;
-    
+
     int res = 1;
     if (cmd[i].cmd) // Invoke command handler
         res = (this->*cmd[i].fun)(cmdArgs);
@@ -449,7 +450,7 @@ const char *MyClient::getCommand()
     strncpy(m_thisCommand,line_in, 1023);
     m_thisCommand[1023] = '\0';
     free (line_in);
-#else    
+#else
     // Read using fgets(3)
     printf (C_PROMPT);
     fflush(stdout);
@@ -554,6 +555,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab