Changeset 1851

Timestamp:

01/04/12 16:57:00 (5 months ago)

Author:

Dylan

Message:

unxsVZ minor node report tweak, commit working Org interface extension.

Location:

trunk

Files:

• interfaces/Org/container.c (modified) (1 diff)
• tnodefunc.h (modified) (3 diffs)

trunk/interfaces/Org/container.c

@@ -1703 +1703 @@
         }
 
+        //BackupDate
+        sprintf(gcQuery,"SELECT FROM_UNIXTIME(uBackupDate,'%%a %%b %%d %%T %%Y'),cLabel FROM tContainer"
+                        " WHERE uContainer IN (SELECT uContainer FROM tContainer WHERE uSource=%u)",guContainer);
+        mysql_query(&gMysql,gcQuery);
+        if(mysql_errno(&gMysql))
+                htmlPlainTextError(mysql_error(&gMysql));
+        res=mysql_store_result(&gMysql);
+        if((field=mysql_fetch_row(res)))
+        {
+                printf("<tr><td><a class=inputLink href=\"#\" onClick=\"open_popup('unxsvzOrg.cgi?gcPage=Glossary&cLabel=uBackupDate')\">"
+                        " <strong>Backup Date</strong></a></td><td><input type=text name='cBackupDate' value='%s (%s)'"
+                        " size=40 maxlength=32"
+                        " disabled class=\"type_fields_off\"> </td></tr>\n",field[0],field[1]);
+        }
+        else
+        {
+                printf("<tr><td><a class=inputLink href=\"#\" onClick=\"open_popup('unxsvzOrg.cgi?gcPage=Glossary&cLabel=uBackupDate')\">"
+                        " <strong>Backup Date</strong></a></td><td><input type=text name='cBackupDate' value='!No backup available!'"
+                        " size=40 maxlength=32"
+                        " disabled class=\"type_fields_off\"> </td></tr>\n");
+        }
+
 /*
         //ModBy

trunk/tnodefunc.h

@@ -589 +589 @@
                                 "<td><u>master hostname</u></td>"
                                 "<td><u>template</u></td>"
+                                "<td><u>status</u></td>"
                                 "<td><u>clone label</u></td>"
                                 "<td><u>clone hostname</u></td>"
@@ -595 +596 @@
                                 "</tr>");
                         sprintf(gcQuery,"SELECT tContainer.uContainer,tContainer.cLabel,tContainer.cHostname,"
-                                        "tContainer.uNode,tContainer.uDatacenter,tOSTemplate.cLabel"
-                                        " FROM tContainer,tOSTemplate"
+                                        "tContainer.uNode,tContainer.uDatacenter,tOSTemplate.cLabel,tStatus.cLabel"
+                                        " FROM tContainer,tOSTemplate,tStatus"
                                         " WHERE tContainer.uNode=%u"
                                         " AND tContainer.uOSTemplate=tOSTemplate.uOSTemplate"
+                                        " AND tContainer.uStatus=tStatus.uStatus"
                                         " AND tContainer.uSource=0"
                                         " ORDER BY tContainer.cLabel",uNode);
@@ -618 +620 @@
                                                 "</td>"
                                                 "<td>%s</td>"
+                                                "<td>%s</td>"
                                                 "<td>%s</td>",
                                                         //field[0],
-                                                        field[0],field[1],field[2],field[5]);
+                                                        field[0],field[1],field[2],field[5],field[6]);
                                         sprintf(gcQuery,"SELECT uContainer,cLabel,cHostname,(UNIX_TIMESTAMP(NOW())-uBackupDate),"
                                                         "uDatacenter,uNode,uIPv4,uStatus,uOwner"