#include "webcit.h"
#include "webserver.h"
+#include "roomops.h"
#define MAX_FLOORS 128
char floorlist[MAX_FLOORS][SIZ]; /* list of our floor names */
* Basically we pull LFLR/LKRA etc. and set up a room HashList with these keys.
*/
-#define FLOOR_PARAM_LEN 3
-const ConstStr FLOOR_PARAM_NAMES[] = {{HKEY("ID")},
- {HKEY("NAME")},
- {HKEY("ROOMS")}};
-
-#define ROOM_PARAM_LEN 8
-const ConstStr ROOM_PARAM_NAMES[] = {{HKEY("NAME")},
- {HKEY("FLAG")},
- {HKEY("FLOOR")},
- {HKEY("LISTORDER")},
- {HKEY("ACL")},
- {HKEY("CURVIEW")},
- {HKEY("DEFVIEW")},
- {HKEY("LASTCHANGE")}};
-
-
void display_whok(void);
/*
* \param max_folders how many folders???
* \param num_floors hom many floors???
*/
-void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
+void do_folder_view(struct __ofolder *fold, int max_folders, int num_floors) {
char buf[SIZ];
int levels;
int i;
* \param max_folders how many folders???
* \param num_floors hom many floors???
*/
-void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
+void do_rooms_view(struct __ofolder *fold, int max_folders, int num_floors) {
char buf[256];
char floor_name[256];
char old_floor_name[256];
* \param max_folders how many folders???
* \param num_floors hom many floors???
*/
-void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
+void do_iconbar_view(struct __ofolder *fold, int max_folders, int num_floors) {
char buf[256];
char floor_name[256];
char old_floor_name[256];
StrBuf *Buf;
char buf[SIZ];
int swap = 0;
- struct folder *fold = NULL;
- struct folder ftmp;
+ struct __ofolder *fold = NULL;
+ struct __ofolder ftmp;
int max_folders = 0;
int alloc_folders = 0;
int *floor_mapping;
/** Start with the mailboxes */
max_folders = 1;
alloc_folders = 1;
- fold = malloc(sizeof(struct folder));
- memset(fold, 0, sizeof(struct folder));
+ fold = malloc(sizeof(struct __ofolder));
+ memset(fold, 0, sizeof(struct __ofolder));
strcpy(fold[0].name, "My folders");
fold[0].is_mailbox = 1;
if (max_folders >= alloc_folders) {
alloc_folders = max_folders + 100;
fold = realloc(fold,
- alloc_folders * sizeof(struct folder));
+ alloc_folders * sizeof(struct __ofolder));
}
- memset(&fold[max_folders], 0, sizeof(struct folder));
+ memset(&fold[max_folders], 0, sizeof(struct __ofolder));
extract_token(fold[max_folders].name, buf, 1, '|', sizeof fold[max_folders].name);
extract_token(buf3, buf, 0, '|', SIZ);
fold[max_folders].floor = atol (buf3);
if (max_folders >= alloc_folders) {
alloc_folders = max_folders + 100;
fold = realloc(fold,
- alloc_folders * sizeof(struct folder));
+ alloc_folders * sizeof(struct __ofolder));
}
- memset(&fold[max_folders], 0, sizeof(struct folder));
+ memset(&fold[max_folders], 0, sizeof(struct __ofolder));
extract_token(fold[max_folders].room, buf, 0, '|', sizeof fold[max_folders].room);
ra_flags = extract_int(buf, 5);
flags = extract_int(buf, 1);
{
if (fold[i].num_rooms == 0) {
for (j=i; j<max_folders; j++) {
- memcpy(&fold[j], &fold[j+1], sizeof(struct folder));
+ memcpy(&fold[j], &fold[j+1], sizeof(struct __ofolder));
}
max_folders--;
num_floors--;
}
}
if (swap > 0) {
- memcpy(&ftmp, &fold[j], sizeof(struct folder));
+ memcpy(&ftmp, &fold[j], sizeof(struct __ofolder));
memcpy(&fold[j], &fold[j+1],
- sizeof(struct folder));
+ sizeof(struct __ofolder));
memcpy(&fold[j+1], &ftmp,
- sizeof(struct folder));
+ sizeof(struct __ofolder));
}
}
}
display_editroom();
}
+void DeleteFloor(void *vFloor)
+{
+ floor *Floor;
+ Floor = (floor*) vFloor;
+ FreeStrBuf(&Floor->Name);
+ free(Floor);
+}
+
HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP) {
- /* todo: check context */
const char *Err;
StrBuf *Buf;
- StrBuf *Buf2;
HashList *floors;
- HashList *floor;
- floors = NewHash(1, NULL);
+ floor *Floor;
+ const char *Pos;
+ wcsession *WCC = WC;
+
+ if (WCC->Floors != NULL)
+ return WCC->Floors;
+ WCC->Floors = floors = NewHash(1, NULL);
Buf = NewStrBuf();
serv_puts("LFLR"); /* get floors */
StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err); /* '100', we hope */
if (GetServerStatus(Buf, NULL) == 1)
- while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000")) {
- int a;
- const StrBuf *floorNum = NULL;
- floor = NewHash(1, NULL);
- for(a=0; a<FLOOR_PARAM_LEN; a++) {
- Buf2 = NewStrBuf();
- StrBufExtract_token(Buf2, Buf, a, '|');
- if (a==0) {
- floorNum = Buf2; /* hmm, should we copy Buf2 first? */
-
- }
- Put(floor, CKEY(FLOOR_PARAM_NAMES[a]), Buf2, HFreeStrBuf);
- }
- Put(floors, SKEY(floorNum), floor, HDeleteHash);
+ {
+ while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000"))
+ {
+
+ Pos = NULL;
+
+ Floor = malloc(sizeof(floor));
+ Floor->ID = StrBufExtractNext_long(Buf, &Pos, '|');
+ Floor->Name = NewStrBufPlain(NULL, StrLength(Buf));
+ StrBufExtract_NextToken(Floor->Name, Buf, &Pos, '|');
+ Floor->NRooms = StrBufExtractNext_long(Buf, &Pos, '|');
+
+ Put(floors, IKEY(Floor->ID), Floor, DeleteFloor);
}
+ }
FreeStrBuf(&Buf);
return floors;
}
-void tmplput_FLOOR_Value(StrBuf *TemplBuffer, WCTemplputParams *TP)
+void tmplput_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP)
+{
+ floor *Floor = (floor *)(TP->Context);
+
+ StrBufAppendPrintf(Target, "%d", Floor->ID);
+}
+
+void tmplput_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP)
+{
+ floor *Floor = (floor *)(TP->Context);
+
+ StrBufAppendTemplate(Target, TP, Floor->Name, 0);
+}
+
+void tmplput_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP)
{
- StrBuf *val;
- HashList *floor = (HashList *)(TP->Context);
- void *value;
- GetHash(floor, TKEY(0), &value);
- val = (StrBuf *)value;
- StrECMAEscAppend(TemplBuffer, val, 0);
+ floor *Floor = (floor *)(TP->Context);
+
+ StrBufAppendPrintf(Target, "%d", Floor->NRooms);
}
HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP)
{
serv_puts("LKRA");
return GetRoomListHash(Target, TP);
}
+
+void DeleteFolder(void *vFolder)
+{
+ folder *room;
+ room = (folder*) vFolder;
+
+ FreeStrBuf(&room->name);
+ FreeStrBuf(&room->ACL);
+
+ //// FreeStrBuf(&room->room);
+
+ free(room);
+}
+
+
HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
{
/* TODO: Check context */
HashList *rooms;
- HashList *room;
- StrBuf *buf;
- StrBuf *buf2;
+ folder *room;
+ StrBuf *Buf;
+ wcsession *WCC = WC;
+ const char *Pos;
const char *Err;
- buf = NewStrBuf();
+ void *vFloor;
+
+ Buf = NewStrBuf();
rooms = NewHash(1, NULL);
- StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err);
- if (GetServerStatus(buf, NULL) == 1)
- while(StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(buf), "000")) {
- int i;
- StrBuf *rmName = NULL;
- room = NewHash(1, NULL);
- for(i=0; i<ROOM_PARAM_LEN; i++) {
- buf2 = NewStrBuf();
- StrBufExtract_token(buf2, buf, i, '|');
- if (i==0) {
- rmName = buf2;
- }
- Put(room, CKEY(ROOM_PARAM_NAMES[i]), buf2, HFreeStrBuf);
- }
- Put(rooms, SKEY(rmName), room, HDeleteHash);
+ StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err);
+ if (GetServerStatus(Buf, NULL) == 1)
+ {
+ while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err),
+ strcmp(ChrPtr(Buf), "000"))
+ {
+
+ Pos = NULL;
+ room = (folder*) malloc (sizeof(folder));
+ memset(room, 0, sizeof(folder));
+
+ room->name = NewStrBufPlain(NULL, StrLength(Buf));
+ StrBufExtract_NextToken(room->name, Buf, &Pos, '|');
+
+ room->QRFlags = StrBufExtractNext_long(Buf, &Pos, '|');
+ room->floorid = StrBufExtractNext_long(Buf, &Pos, '|');
+
+ room->listorder = StrBufExtractNext_long(Buf, &Pos, '|');
+
+ room->ACL = NewStrBufPlain(NULL, StrLength(Buf));
+ StrBufExtract_NextToken(room->ACL, Buf, &Pos, '|');
+
+ room->view = StrBufExtractNext_long(Buf, &Pos, '|');
+ room->defview = StrBufExtractNext_long(Buf, &Pos, '|');
+ room->lastchange = StrBufExtractNext_long(Buf, &Pos, '|');
+
+
+ GetHash(WCC->Floors, IKEY(room->floorid), &vFloor);
+ room->Floor = (const floor*) vFloor;
+ Put(rooms, SKEY(room->name), room, DeleteFolder);
}
+ }
SortByHashKey(rooms, 1);
/*SortByPayload(rooms, SortRoomsByListOrder); */
- FreeStrBuf(&buf);
+ FreeStrBuf(&Buf);
return rooms;
}
+
/** Unused function that orders rooms by the listorder flag */
int SortRoomsByListOrder(const void *room1, const void *room2)
{
- int l1;
- int l2;
- HashList *r1 = (HashList *)GetSearchPayload(room1);
- HashList *r2 = (HashList *)GetSearchPayload(room2);
- StrBuf *listOrderBuf1;
- StrBuf *listOrderBuf2;
+ folder *r1 = (folder*) room1;
+ folder *r2 = (folder*) room2;
+
+ if (r1->listorder == r2->listorder) return 0;
+ if (r1->listorder > r2->listorder) return 1;
+ return -1;
+}
+
+int SortRoomsByFloorAndName(const void *room1, const void *room2)
+{
+ folder *r1 = (folder*) room1;
+ folder *r2 = (folder*) room2;
- GetHash(r1, CKEY(ROOM_PARAM_NAMES[3]), (void *)&listOrderBuf1);
- GetHash(r2, CKEY(ROOM_PARAM_NAMES[3]), (void *)&listOrderBuf2);
- l1 = atoi(ChrPtr(listOrderBuf1));
- l2 = atoi(ChrPtr(listOrderBuf2));
- if (l1 < l2) return -1;
- else if (l1 > l2) return +1;
- else return 0;
+ if (r1->Floor != r2->Floor)
+ return strcmp(ChrPtr(r1->Floor->Name),
+ ChrPtr(r2->Floor->Name));
+ return strcmp (ChrPtr(r1->name),
+ ChrPtr(r2->name));
+}
+
+
+
+void tmplput_ROOM_NAME(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+
+ StrBufAppendTemplate(Target, TP, Folder->name, 0);
+}
+
+void tmplput_ROOM_ACL(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+
+ StrBufAppendTemplate(Target, TP, Folder->ACL, 0);
}
-void tmplput_ROOM_Value(StrBuf *TemplBuffer, WCTemplputParams *TP)
+
+
+void tmplput_ROOM_QRFLAGS(StrBuf *Target, WCTemplputParams *TP)
{
- void *value;
- StrBuf *val;
- HashList *room = (HashList *)(TP->Context);
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->QRFlags);
+}
+
+
- GetHash(room, TKEY(0), &value);
- val = (StrBuf *)value;
- StrECMAEscAppend(TemplBuffer, val, 0);
+void tmplput_ROOM_FLOORID(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->floorid);
+}
+
+void tmplput_ROOM_LISTORDER(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->listorder);
+}
+void tmplput_ROOM_VIEW(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->view);
+}
+void tmplput_ROOM_DEFVIEW(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->defview);
}
+void tmplput_ROOM_LASTCHANGE(StrBuf *Target, WCTemplputParams *TP)
+{
+ folder *Folder = (folder *)(TP->Context);
+ StrBufAppendPrintf(Target, "%d", Folder->lastchange);
+}
+
void jsonRoomFlr(void)
{
/* Send as our own (application/json) content type */
RegisterConditional(HKEY("COND:ROOM:EDITACCESS"), 0, ConditionalHaveRoomeditRights, CTX_NONE);
RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, 0);
- RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, DeleteHash, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
- RegisterNamespace("FLOOR:INFO", 1, 2, tmplput_FLOOR_Value, CTX_FLOORS);
+ RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
+
+ RegisterNamespace("FLOOR:ID", 0, 0, tmplput_FLOOR_ID, CTX_FLOORS);
+ RegisterNamespace("FLOOR:NAME", 0, 1, tmplput_FLOOR_NAME, CTX_FLOORS);
+ RegisterNamespace("FLOOR:NROOMS", 0, 0, tmplput_FLOOR_NROOMS, CTX_FLOORS);
+
+
+
RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_NOFLAG);
- RegisterNamespace("ROOM:INFO", 1, 2, tmplput_ROOM_Value, CTX_ROOMS);
+
+ RegisterNamespace("ROOM:INFO:FLOORID", 0, 1, tmplput_ROOM_FLOORID, CTX_ROOMS);
+ RegisterNamespace("ROOM:INFO:NAME", 0, 1, tmplput_ROOM_NAME, CTX_ROOMS);
+ RegisterNamespace("ROOM:INFO:ACL", 0, 1, tmplput_ROOM_ACL, CTX_ROOMS);
+ RegisterNamespace("ROOM:INFO:QRFLAGS", 0, 1, tmplput_ROOM_QRFLAGS, CTX_ROOMS);
+ RegisterNamespace("ROOM:INFO:LISTORDER", 0, 1, tmplput_ROOM_LISTORDER, CTX_ROOMS);
+ RegisterNamespace("ROOM:INFO:VIEW", 0, 1, tmplput_ROOM_VIEW, CTX_ROOMS);
+ RegisterNamespace("ROOM:INFO:DEFVIEW", 0, 1, tmplput_ROOM_DEFVIEW, CTX_ROOMS);
+ RegisterNamespace("ROOM:INFO:LASTCHANGE", 0, 1, tmplput_ROOM_LASTCHANGE, CTX_ROOMS);
}
}
free_march_list(sess);
+ DeleteHash(&sess->Floors);
}
/*@}*/
projects / citadel.git / blobdiff