Added months, years and millenia to time to completion estimates

git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPD/trunk@93 1faa4e14-9dd3-4be0-9f0e-ffe519881164

1 files changed, 45 insertions, 2 deletions

diff --git a/src/Content.c b/src/Content.c
index 4e7380b..2c8992b 100644
--- a/src/Content.c
+++ b/src/Content.c
@@ -299,10 +299,10 @@ static int MainPage(cGH *cctkGH, httpRequest *request, void *data)
   char *dir;
   char *file;
   struct httpLink *link;
-  int seconds,minutes,hours,days,weeks;
+  int seconds,minutes,hours,days,weeks,months,years,millenia;
 
   /* Status message */
-  strcpy(message,"HTTP/1.0 200 OK\r\n");
+  strcpy(message,"HTTP/1.0 200 OK\r\n"); 
   
   HTTP_Write(request, message, strlen(message));
 
@@ -432,8 +432,29 @@ static int MainPage(cGH *cctkGH, httpRequest *request, void *data)
   hours = hours-days*24;
   weeks = days/7;
   days=days-weeks*7;
+  months = weeks/4;
+  weeks=weeks-months*4;
+  years = months/12;
+  months=months-years*12;
+  millenia=years/1000;
+  years=years-millenia*1000;
 
   strcpy(message,"<li>Time since start up\n<ul>");
+  if (millenia)
+  {
+    sprintf(message,
+	    "%s <li><font color=red>%d</font> millenia\n",message,millenia);
+  }
+  if (years)
+  {
+    sprintf(message,
+	    "%s <li><font color=red>%d</font> years\n",message,years);
+  }
+  if (months)
+  {
+    sprintf(message,
+	    "%s <li><font color=red>%d</font> months\n",message,months);
+  }
   if (weeks)
   {
     sprintf(message,
@@ -499,7 +520,29 @@ static int MainPage(cGH *cctkGH, httpRequest *request, void *data)
     hours = hours-days*24;
     weeks = days/7;
     days=days-weeks*7;
+    months = weeks/4;
+    weeks=weeks-months*4;
+    years = months/12;
+    months=months-years*12;
+    millenia=years/1000;
+    years=years-millenia*1000;
+  
 
+    if (millenia)
+    {
+      sprintf(message,
+	      "%s <li><font color=red>%d</font> millenia\n",message,millenia);
+    }
+    if (years)
+    {
+      sprintf(message,
+	      "%s <li><font color=red>%d</font> years\n",message,years);
+    }
+    if (months)
+    {
+      sprintf(message,
+	      "%s <li><font color=red>%d</font> months\n",message,months);
+    }
     if (weeks)
     {
       sprintf(message,