[Openvas-commits] r5613 - in trunk/openvas-manager: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-10-19 14:16:50 +0200 (Mon, 19 Oct 2009)
New Revision: 5613

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage.h
   trunk/openvas-manager/src/omp.c
   trunk/openvas-manager/src/tasks_sql.h
Log:
	* src/tasks_sql.h (report_counts): Swap infos and warnings.
	(task_infos_size): Count Notes instead of Warnings.
	(task_notes_size): Remove.
	(task_warnings_size): New function.
	* src/manage.h: Update header.

	* src/omp.c (omp_xml_handle_end_element): Call task_warnings_size instead
	of task_notes_size.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-10-19 12:15:35 UTC (rev 5612)
+++ trunk/openvas-manager/ChangeLog	2009-10-19 12:16:50 UTC (rev 5613)
@@ -1,3 +1,14 @@
+2009-10-19  Matthew Mundell <matthew.mundell at intevation.de>
+
+	* src/tasks_sql.h (report_counts): Swap infos and warnings.
+	(task_infos_size): Count Notes instead of Warnings.
+	(task_notes_size): Remove.
+	(task_warnings_size): New function.
+	* src/manage.h: Update header.
+
+	* src/omp.c (omp_xml_handle_end_element): Call task_warnings_size instead
+	of task_notes_size.
+
 2009-10-19  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
 	* src/omp.c (convert_to_newlines): Handle backslashes not followed by

Modified: trunk/openvas-manager/src/manage.h
===================================================================
--- trunk/openvas-manager/src/manage.h	2009-10-19 12:15:35 UTC (rev 5612)
+++ trunk/openvas-manager/src/manage.h	2009-10-19 12:16:50 UTC (rev 5613)
@@ -270,7 +270,7 @@
 task_logs_size (task_t);
 
 int
-task_notes_size (task_t);
+task_warnings_size (task_t);
 
 void
 free_tasks ();

Modified: trunk/openvas-manager/src/omp.c
===================================================================
--- trunk/openvas-manager/src/omp.c	2009-10-19 12:15:35 UTC (rev 5612)
+++ trunk/openvas-manager/src/omp.c	2009-10-19 12:16:50 UTC (rev 5613)
@@ -4756,7 +4756,7 @@
                                  task_holes_size (task),
                                  task_infos_size (task),
                                  task_logs_size (task),
-                                 task_notes_size (task),
+                                 task_warnings_size (task),
                                  task_report_count (task),
                                  task_finished_report_count (task),
                                  first_report,
@@ -5062,7 +5062,7 @@
                                         task_holes_size (index),
                                         task_infos_size (index),
                                         task_logs_size (index),
-                                        task_notes_size (index),
+                                        task_warnings_size (index),
                                         task_report_count (index),
                                         task_finished_report_count (index),
                                         first_report,

Modified: trunk/openvas-manager/src/tasks_sql.h
===================================================================
--- trunk/openvas-manager/src/tasks_sql.h	2009-10-19 12:15:35 UTC (rev 5612)
+++ trunk/openvas-manager/src/tasks_sql.h	2009-10-19 12:16:50 UTC (rev 5613)
@@ -2509,9 +2509,9 @@
 {
   REPORT_COUNT (debugs,   "Debug Message");
   REPORT_COUNT (holes,    "Security Hole");
-  REPORT_COUNT (infos,    "Security Warning");
+  REPORT_COUNT (infos,    "Security Note");
   REPORT_COUNT (logs,     "Log Message");
-  REPORT_COUNT (warnings, "Security Note");
+  REPORT_COUNT (warnings, "Security Warning");
   return 0;
 }
 
@@ -2660,7 +2660,7 @@
 {
   return sql_int (0, 0,
                   "SELECT count(*) FROM results"
-                  " WHERE task = %llu AND results.type = 'Security Warning';",
+                  " WHERE task = %llu AND results.type = 'Security Notes';",
                   task);
 }
 
@@ -2688,11 +2688,11 @@
  * @return Number of note messages.
  */
 int
-task_notes_size (task_t task)
+task_warnings_size (task_t task)
 {
   return sql_int (0, 0,
                   "SELECT count(*) FROM results"
-                  " WHERE task = %llu AND results.type = 'Security Note';",
+                  " WHERE task = %llu AND results.type = 'Security Warning';",
                   task);
 }