1 files changed, 29 insertions, 41 deletions
diff --git a/src/Processors.c b/src/Processors.c
index 014c344..f0c3527 100644
--- a/src/Processors.c
+++ b/src/Processors.c
@@ -14,10 +14,12 @@
 #include "cctk.h"
 
 #include "util_String.h"
-
+/*
 #include "CactusConnect/HTTPD/src/http_Request.h"
 #include "CactusConnect/HTTPD/src/http_Content.h"
+*/
 #include "httpextra_HostNames.h"
+#include "HTTPDUtils.h"
 
 static const char *rcsid = "$Header$";
 
@@ -92,66 +94,52 @@ int HTTPDExtra_RegisterProcessorsPages(void)
 @@*/
 static int ProcessorsPage(const cGH *cctkGH, httpRequest *request, void *data)
 {
-  int retval;
-  int nprocs,np;
-  char message[4098];
-
-  /* Status message */
-  strcpy(message,"HTTP/1.0 200 OK\r\n");
-  
-  HTTP_Write(request, message, strlen(message));
+  int retval = 0;
+  int nprocs = 0,np = 0;
+  String *message = String_New();
 
-  /* Content-Type */
-  strcpy(message,"Content-Type: text/html\r\n\r\n");
-
-  HTTP_Write(request, message, strlen(message));
+  SendHTTP_OK_Header( request );
 
+  SetHTML_Doctype( message );
+  Send_HTTP_String(request, message);
 
   /* Start the page */
-  strcpy(message,"<HTML><HEAD><TITLE>Cactus Simulation Processor Information</TITLE>\n");
-
-  HTTP_Write(request, message, strlen(message));
+  Send_HTTP(request, "<html>\n<head>\n");
+  Send_HTTP(request, "<title>Cactus Simulation Processor Information</title>\n");
 
+  SetHTML_HeadHeader( message);
+  Send_HTTP_String(request, message );
+    
   /* HTTP_Write out the header part. */
+  SetHTML_ContentHeader(cctkGH, 0, message, NULL);
+  retval = Send_HTTP_String(request, message);
+  
+  Send_HTTP(request, "<h1>Processor Information</h1>\n");
 
-  HTTP_ContentHeader(cctkGH,0,strlen(message),message,NULL);
-
-  retval = HTTP_Write(request, message, strlen(message));
-
-  strcpy(message, "<center><h1>Processor Information</h1></center>\n");
-  retval = HTTP_Write(request, message, strlen(message));
-
-  strcpy(message,
+  Send_HTTP(request, 
 	 "<center>\n<table>\n"
 	 "<tr>"
 	 "<th>Number</th>\n"
 	 "<th>Machine Name</th>\n"
 	 "</tr>");
-  retval = HTTP_Write(request, message, strlen(message));
 	 
   nprocs = CCTK_nProcs(cctkGH);
   for (np=0;np<nprocs;np++)
   {
-    sprintf(message,
-	    "<tr>"
-	    "<td align=center>%d</td>"
-	    "<td align=left>%s</td>"
-	    "</tr>\n",
-	    np,
-	    HTTPDExtra_RemoteHostName(np)
-	    );
-    retval = HTTP_Write(request, message, strlen(message));
+    SetToCString( message, "<tr><td align=center>" );
+    ConcatDecimal( message, np );
+    ConcatCString( message, "</td><td align=left>" );
+    ConcatCString( message, HTTPDExtra_RemoteHostName(np) );
+    ConcatCString( message, "</td></tr>\n");
+    Send_HTTP_String(request, message );
   }
 
-  strcpy(message,
-	 "</table>\n</center>\n");
-  retval = HTTP_Write(request, message, strlen(message));
+  retval = Send_HTTP(request, "</table>\n</center>\n");
     
-  /* Write out the footer part. */
-
-  HTTP_ContentFooter(cctkGH,0,strlen(message),message);
-  retval = HTTP_Write(request, message, strlen(message));
+  SetHTML_ContentFooter(cctkGH, 0, message);
+  retval = Send_HTTP_String(request, message);
 
+  String_Delete( message );
   return retval;
 }