diff options
Diffstat (limited to 'src/Groups.c')
| -rw-r--r-- | src/Groups.c | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/Groups.c b/src/Groups.c index 3df8f40..b16ff8a 100644 --- a/src/Groups.c +++ b/src/Groups.c @@ -16,10 +16,9 @@ #include "util_String.h" -#include "http_Request.h" -#include "http_Content.h" +#include "httpRequest.h" +#include "Content.h" -#include "http_SString.h" #include "SString_Namespace.h" static const char *rcsid = "$Header$"; @@ -107,29 +106,29 @@ static int GroupsPage(const cGH *cctkGH, httpRequest *request, void *data) /* avoid compiler warning about unused parameter */ data = data; - SendHTTP_OK_Header( request ); + HTTP_Send_OK_Header( request ); /* Start the page */ - SetHTML_Doctype( message ); - Send_HTTP_String(request, message); + HTTP_SetDoctype( message ); + HTTP_SendString(request, message); - Send_HTTP(request,"<html><head>\n"); - Send_HTTP(request,"<title>Cactus Simulation Group Information</title>\n"); + HTTP_Send(request,"<html><head>\n"); + HTTP_Send(request,"<title>Cactus Simulation Group Information</title>\n"); - SetHTML_HeadHeader( message); - Send_HTTP_String(request, message ); + HTTP_SetHeadInfo( message); + HTTP_SendString(request, message ); - Send_HTTP(request,"</head>\n<body>\n"); + HTTP_Send(request,"</head>\n<body>\n"); /* HTTP_Write out the header part. */ - SetHTML_ContentHeader(cctkGH,0,message,NULL); + HTTP_SetContentHeaderString(cctkGH,0,message,NULL); - retval = Send_HTTP_String(request, message); + retval = HTTP_SendString(request, message); ngroups = CCTK_NumGroups(); - retval = Send_HTTP(request, "<h1>Groups and Grid Variables</h1>\n" + retval = HTTP_Send(request, "<h1>Groups and Grid Variables</h1>\n" "<p>These pages describe the grid variables and groups \n" "active in this simulation.</p>\n"); @@ -148,11 +147,11 @@ static int GroupsPage(const cGH *cctkGH, httpRequest *request, void *data) "assigned are written in <span class=\"hilite\">red</span>. \n" "The numbers in square brackets are the group and variable indices." "</p>\n"); - retval = Send_HTTP_String(request, message); + retval = HTTP_SendString(request, message); - retval = Send_HTTP(request,"<form action=\"/Groups.html\" method=\"get\">\n"); + retval = HTTP_Send(request,"<form action=\"/Groups.html\" method=\"get\">\n"); - retval = Send_HTTP(request,"<div class=\"centered\">\n" + retval = HTTP_Send(request,"<div class=\"centered\">\n" "<table class=\"groups\" width=\"100%\" cellpadding=\"5\" " "cellspacing=\"5\">\n" "<tr><th>Groups</th><th>Group Properties</th>" @@ -182,7 +181,7 @@ static int GroupsPage(const cGH *cctkGH, httpRequest *request, void *data) free(groupname); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); /* Group Description */ @@ -215,10 +214,10 @@ static int GroupsPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatCString(message, " <br />\nTimelevels "); ConcatDecimal(message, gdata.numtimelevels); } - Send_HTTP_String(request, message); + HTTP_SendString(request, message); } - Send_HTTP(request,"</td>"); + HTTP_Send(request,"</td>"); nvars = CCTK_NumVarsInGroupI(i); SetToCString(message,"<td>"); @@ -231,16 +230,16 @@ static int GroupsPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatCString(message, "<br />\n" ); } ConcatCString(message,"</td></tr>"); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); } - Send_HTTP(request,"</table></div></form>\n"); + HTTP_Send(request,"</table></div></form>\n"); /* Write out the footer part. */ - SetHTML_ContentFooter(cctkGH,0,message); - retval = Send_HTTP_String(request, message); + HTTP_SetContentFooterString(cctkGH,0,message); + retval = HTTP_SendString(request, message); String_Delete( message ); |