Extra help info, fixed logging for dispense failures, possible fix for logging errors

[tpg/opendispense2.git] / src / client / main.c

diff --git a/src/client/main.c b/src/client/main.c
index 5601c08..0f7d525 100644 (file)
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -23,7 +23,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <openssl/sha.h>       // SHA1
+//#include <openssl/sha.h>     // SHA1
 
 #define        USE_NCURSES_INTERFACE   0
 #define DEBUG_TRACE_SERVER     0
@@ -97,7 +97,7 @@ char  *trim(char *string);
 void   CompileRegex(regex_t *regex, const char *pattern, int flags);
 
 // === GLOBALS ===
-char   *gsDispenseServer = "heathred";
+char   *gsDispenseServer = "merlo.ucc.gu.uwa.edu.au";
  int   giDispensePort = 11020;
 
 tItem  *gaItems;
@@ -161,6 +161,8 @@ void ShowUsage(void)
                printf(
                        "    dispense refund <user> <itemid> [<price>]\n"
                        "        Refund an item to a user (with optional price override)\n"
+                       "        Item IDs can be seen in the cokelog (in the brackets after the item name)\n"
+                       "        e.g. coke:6 for a coke, snack:33 for slot 33 of the snack machine\n"
                        );
        if( giTextArgc == 0 || strcmp(gsTextArgs[0], "slot") == 0 )
                printf(
@@ -1125,7 +1127,7 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
        }
        
        // If the item isn't availiable for sale, return -1 (so it's skipped)
-       if( status || price >= giUserBalance )
+       if( status || price > giUserBalance )
                Index = -1;
        
        return Index;
@@ -2214,7 +2216,7 @@ char *ReadLine(int Socket)
                        len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
                        if( len < 0 ) {
                                free(ret);
-                               return strdup("499 Client Connection Error\n");
+                               return strdup("599 Client Connection Error\n");
                        }
                }
                buf[bufPos+len] = '\0';