git.ucc.asn.au
/
tpg
/
opendispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client - Fixed some bugs with long prices
[tpg/opendispense2.git]
/
src
/
client
/
main.c
diff --git
a/src/client/main.c
b/src/client/main.c
index
d7a8e49
..
204a61e
100644
(file)
--- a/
src/client/main.c
+++ b/
src/client/main.c
@@
-97,7
+97,7
@@
char *trim(char *string);
void CompileRegex(regex_t *regex, const char *pattern, int flags);
// === GLOBALS ===
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;
int giDispensePort = 11020;
tItem *gaItems;
@@
-146,6
+146,11
@@
void ShowUsage(void)
" dispense iteminfo <itemid>\n"
" Get the name and price for an item\n"
);
" dispense iteminfo <itemid>\n"
" Get the name and price for an item\n"
);
+// if( giTextArgc == 0 || strcmp(gsTextArgs[0], "enumitems") == 0 )
+// printf(
+// " dispense enumitems\n"
+// " List avaliable items\n"
+// );
if( giTextArgc == 0 )
printf(" == Coke members == \n");
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "acct") == 0 )
if( giTextArgc == 0 )
printf(" == Coke members == \n");
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "acct") == 0 )
@@
-161,6
+166,8
@@
void ShowUsage(void)
printf(
" dispense refund <user> <itemid> [<price>]\n"
" Refund an item to a user (with optional price override)\n"
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(
);
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "slot") == 0 )
printf(
@@
-814,10
+821,10
@@
int main(int argc, char *argv[])
if( j > 1 ) {
printf("%i items dispensed\n", j);
}
if( j > 1 ) {
printf("%i items dispensed\n", j);
}
+ Dispense_ShowUser(sock, gsUserName);
close(sock);
close(sock);
- }
- Dispense_ShowUser(sock, gsUserName);
+ }
return ret;
}
return ret;
}
@@
-1027,7
+1034,6
@@
int ShowNCursesUI(void)
*/
int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
{
*/
int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
{
- int _x, _y, times;
char *name = NULL;
int price = 0;
int status = -1;
char *name = NULL;
int price = 0;
int status = -1;
@@
-1105,6
+1111,13
@@
int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
break;
}
break;
}
+ if( price > 100*100 ) {
+ nameWidth --;
+ }
+ if( price > 1000*100 ) {
+ nameWidth --;
+ }
+
printw("%-*.*s", nameWidth, nameWidth, name);
// getyx(stdscr, _y, _x);
printw("%-*.*s", nameWidth, nameWidth, name);
// getyx(stdscr, _y, _x);
@@
-1112,15
+1125,13
@@
int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
// times = Width - 5 - (_x - Col); // TODO: Better handling for large prices
// while(times--) addch(' ');
// times = Width - 5 - (_x - Col); // TODO: Better handling for large prices
// while(times--) addch(' ');
+ // 999.99 should be enough
printw(" %4i", price);
}
else
{
printw(" %4i", price);
}
else
{
- printw("-- %s", name);
- getyx(stdscr, _y, _x);
- times = Width - 4 - (_x - Col);
- while(times--) addch(' ');
- printw(" ");
+// int _x, _y, times;
+ printw("-- %-*.*s ", Width-4, Width-4, name);
}
}
}
}
@@
-2212,7
+2223,7
@@
char *ReadLine(int Socket)
}
else {
len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
}
else {
len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
- if( len < 0 ) {
+ if( len <
=
0 ) {
free(ret);
return strdup("599 Client Connection Error\n");
}
free(ret);
return strdup("599 Client Connection Error\n");
}
UCC
git Repository :: git.ucc.asn.au