[Openvas-commits] r10630 - in trunk/gsd: . src

[scm-commit@wald.intevation.org]

Author: raimund
Date: 2011-03-25 13:04:00 +0100 (Fri, 25 Mar 2011)
New Revision: 10630

Modified:
   trunk/gsd/ChangeLog
   trunk/gsd/src/dock_reports.cpp
   trunk/gsd/src/gsd_control.cpp
Log:
* src/gsd_control.cpp (request_report): Changed format strings to the same
format as in they are in omp.
(report_download): Do not make the format to upper case letter.

* src/dock_reports.cpp (update): Insert report formats to combobox.
(load): Insert report formats into combobox. Changed format strings to the
same format as they are in omp.
(download_report): Insert report format name into request parameter.



Modified: trunk/gsd/ChangeLog
===================================================================
--- trunk/gsd/ChangeLog	2011-03-25 10:42:26 UTC (rev 10629)
+++ trunk/gsd/ChangeLog	2011-03-25 12:04:00 UTC (rev 10630)
@@ -1,3 +1,14 @@
+2011-03-25  Raimund Renkert <raimund.renkert at greenbone.net>
+
+	* src/gsd_control.cpp (request_report): Changed format strings to the same
+	format as in they are in omp.
+	(report_download): Do not make the format to upper case letter.
+
+	* src/dock_reports.cpp (update): Insert report formats to combobox.
+	(load): Insert report formats into combobox. Changed format strings to the
+	same format as they are in omp.
+	(download_report): Insert report format name into request parameter.
+
 2011-03-24  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
 	Adding support for indonesian language. Translation work

Modified: trunk/gsd/src/dock_reports.cpp
===================================================================
--- trunk/gsd/src/dock_reports.cpp	2011-03-25 10:42:26 UTC (rev 10629)
+++ trunk/gsd/src/dock_reports.cpp	2011-03-25 12:04:00 UTC (rev 10630)
@@ -60,6 +60,16 @@
     {
       htmlReport->addEntity (control->getHtmlReportModel ()->getEntity (i), i);
     }
+
+  cb_format->clear ();
+  for (int i = 0; i < control->getReportFormatModel ()->rowCount (); i++)
+    {
+      QDomElement elem = control->getReportFormatModel ()->getEntity (i);
+      cb_format->addItem (control->getReportFormatModel ()->getValue (elem,
+                                                                      "name"));
+    }
+
+
   QDomElement tmp_rep;
   if (control->getProtocolVersion () == 1)
     tmp_rep = report->getEntity (0);
@@ -245,13 +255,14 @@
   tb_prev_page->setEnabled (false);
   tb_next_page->setEnabled (false);
 
+  for (int i = 0; i < control->getReportFormatModel ()->rowCount (); i++)
+    {
+      QDomElement elem = control->getReportFormatModel ()->getEntity (i);
+      cb_format->addItem (control->getReportFormatModel ()->getValue (elem,
+                                                                      "name"));
+    }
+
   pb_save->setEnabled (false);
-  cb_format->addItem ("HTML");
-  cb_format->addItem ("XML");
-  cb_format->addItem ("PDF");
-  cb_format->addItem ("ITG");
-  cb_format->addItem ("CPE");
-  cb_format->addItem ("NBE");
 
   cb_selection->addItem (tr ("Filtered results %1-%2").arg (firstResult)
                                              .arg (maxResults));
@@ -281,7 +292,7 @@
 
   QMap<QString, QString> parameter;
   parameter.insert ("report_id", id);
-  parameter.insert ("format", "xml");
+  parameter.insert ("format", "XML");
   parameter.insert ("notes", "1");
   parameter.insert ("note_details", "1");
   parameter.insert ("overrides", "1");
@@ -300,7 +311,7 @@
   wi_loading->setVisible (true);
 
   emit sig_request_report (parameter);
-  parameter.insert ("format", "html");
+  parameter.insert ("format", "HTML");
   emit sig_request_report (parameter);
   connect (cb_sort,
            SIGNAL (currentIndexChanged (int)),
@@ -424,7 +435,7 @@
     }
   QMap<QString, QString> parameter;
   parameter.insert ("report_id", id);
-  parameter.insert ("format", "xml");
+  parameter.insert ("format", "XML");
   parameter.insert ("notes", "1");
   parameter.insert ("note_details", "1");
   parameter.insert ("overrides", "1");
@@ -447,7 +458,7 @@
   la_text->setText ("Requesting Report");
   emit sig_request_report (parameter);
 
-  parameter.insert ("format", "html");
+  parameter.insert ("format", "HTML");
   emit sig_request_report (parameter);
 }
 
@@ -574,7 +585,10 @@
   QString search = le_search->text ();
   double cvss = (double)hs_cvss->value () / 10;
 
-  QString format = cb_format->currentText ().toLower ();
+  QDomElement elem = control->getReportFormatModel ()
+                              ->getEntity (cb_format->currentIndex ());
+  QString format = control->getReportFormatModel ()->getValue (elem,
+                                                               "extension");
   fileName = QFileDialog::getSaveFileName (this,
                                            tr ("Save File ..."),
                                            QDir::homePath () +
@@ -604,7 +618,8 @@
 
   QMap<QString, QString> parameter;
   parameter.insert ("report_id", id);
-  parameter.insert ("format", format);
+  parameter.insert ("format",
+                    control->getReportFormatModel ()->getValue (elem, "name"));
   parameter.insert ("notes", "1");
   parameter.insert ("note_details", "1");
   parameter.insert ("overrides", "1");

Modified: trunk/gsd/src/gsd_control.cpp
===================================================================
--- trunk/gsd/src/gsd_control.cpp	2011-03-25 10:42:26 UTC (rev 10629)
+++ trunk/gsd/src/gsd_control.cpp	2011-03-25 12:04:00 UTC (rev 10630)
@@ -1598,7 +1598,7 @@
       return;
     }
 
-  if (parameter["format"].compare ("html") == 0)
+  if (parameter["format"].compare ("HTML") == 0)
     {
       parameter.remove ("format");
       if (htmlReportModel->rowCount () > 0)
@@ -1612,7 +1612,7 @@
                                   htmlReportModel,
                                   parameter);
     }
-  if (parameter["format"].compare ("xml") == 0)
+  if (parameter["format"].compare ("XML") == 0)
     {
       parameter.remove ("format");
       if (xmlReportModel->rowCount () > 0)
@@ -1684,7 +1684,7 @@
           for (int i = 0; i < reportFormatModel->rowCount (); i++)
             {
               if (reportFormatModel->getValue (reportFormatModel->getEntity (i),
-                                               "name").compare (f.toUpper ()) == 0)
+                                               "name").compare (f) == 0)
                 {
                   element = reportFormatModel->getEntity (i);
                   break;