diff options
Diffstat (limited to 'src/Processors.c')
| -rw-r--r-- | src/Processors.c | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/src/Processors.c b/src/Processors.c index 3b6296a..1de399d 100644 --- a/src/Processors.c +++ b/src/Processors.c @@ -13,7 +13,11 @@ #include "util_String.h" #include "httpextra_HostNames.h" -#include "HTTPDUtils.h" +#include "http_Content.h" + +/* SW Temporary, while testing the SString module*/ +#include "CactusConnect/HTTPD/src/SString.h" +#include "CactusConnect/HTTPD/src/SString_Namespace.h" static const char *rcsid = "$Header$"; @@ -92,32 +96,32 @@ static int ProcessorsPage(const cGH *cctkGH, httpRequest *request, void *data) int nprocs = 0,np = 0; String *message = String_New(); - SendHTTP_OK_Header( request ); + HTTP_Send_OK_Header( request ); - SetHTML_Doctype( message ); - Send_HTTP_String(request, message); + HTTP_SetDoctype( message ); + HTTP_SendString(request, message); /* Start the page */ - Send_HTTP(request, "<html>\n<head>\n"); - Send_HTTP(request, "<title>Cactus Simulation Processor Information</title>\n"); + HTTP_Send(request, "<html>\n<head>\n"); + HTTP_Send(request, "<title>Cactus Simulation Processor Information</title>\n"); - SetHTML_HeadHeader( message); - Send_HTTP_String(request, message ); + HTTP_SetHeadInfo( message); + HTTP_SendString(request, message ); - Send_HTTP(request, "<style type=\"text/css\">\n"); - Send_HTTP(request, " th, td { padding-left: 1em; padding-right: 1em; }\n"); - Send_HTTP(request, " td.name { text-align: left; }\n"); - Send_HTTP(request, " td.number { text-align: center; }\n"); - Send_HTTP(request, "</style>\n"); - Send_HTTP(request, "</head>\n<body>\n"); + HTTP_Send(request, "<style type=\"text/css\">\n"); + HTTP_Send(request, " th, td { padding-left: 1em; padding-right: 1em; }\n"); + HTTP_Send(request, " td.name { text-align: left; }\n"); + HTTP_Send(request, " td.number { text-align: center; }\n"); + HTTP_Send(request, "</style>\n"); + HTTP_Send(request, "</head>\n<body>\n"); /* HTTP_Write out the header part. */ - SetHTML_ContentHeader(cctkGH, 0, message, NULL); - retval = Send_HTTP_String(request, message); + HTTP_SetContentHeaderString(cctkGH, 0, message, NULL); + retval = HTTP_SendString(request, message); - Send_HTTP(request, "<h1>Processor Information</h1>\n"); + HTTP_Send(request, "<h1>Processor Information</h1>\n"); - Send_HTTP(request, + HTTP_Send(request, "<div class=\"centered\">\n<table rules=\"cols\">\n" "<tr>" "<th>Number</th>\n" @@ -132,13 +136,13 @@ static int ProcessorsPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatCString( message, "</td><td class=\"name\">" ); ConcatCString( message, HTTPDExtra_RemoteHostName(np) ); ConcatCString( message, "</td></tr>\n"); - Send_HTTP_String(request, message ); + HTTP_SendString(request, message ); } - retval = Send_HTTP(request, "</table>\n</div>\n"); + retval = HTTP_Send(request, "</table>\n</div>\n"); - SetHTML_ContentFooter(cctkGH, 0, message); - retval = Send_HTTP_String(request, message); + HTTP_SetContentFooterString(cctkGH, 0, message); + retval = HTTP_SendString(request, message); String_Delete( message ); return retval; |