added package status option

[ppastats.git] / src / html.c
diff --git a/src/html.c b/src/html.c

index 9734c72..28fe195 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -20,6 +20,7 @@
  #include <string.h>
  
  #include "html.h"
+#include "list.h"
  #include "lp_ws.h"
  
  #include <json/json.h>
@@ -30,7 +31,8 @@
  #define HTML_TEMPLATE \
  "<html>\n\
    <head>\n\
-    <script type='text/javascript' src='https://www.google.com/jsapi'></script>\n\
+    <script type='text/javascript'\
+           src='https://www.google.com/jsapi'></script>\n\
      <script type='text/javascript'>\n\
        google.load('visualization', '1', {packages:['corechart']});\
        google.setOnLoadCallback(drawChart);\n\
@@ -40,8 +42,10 @@
  %s\
         data.addRows(%s);\n\
         data.sort(0);\n\
-        var chart = new google.visualization.LineChart(document.getElementById('chart_div'));\n\
-       chart.draw(data, {width: 1024, height: 768, title: 'PPA Statistics'});\n\
+       var chart = new google.visualization.LineChart\
+               (document.getElementById('chart_div'));\n\
+       chart.draw(data, {width: 1024, height: 768,\
+                         title: 'PPA Statistics'});\n\
        }\n\
      </script>\n\
    </head>\n\
@@ -142,7 +146,7 @@ build_data_str(struct binary_package_publishing_history **list)
         data = json_object_new_array();
         for (i = 0; i < n; i++) {
                 struct binary_package_publishing_history *binary;
-               struct distro_arch_series *dist;
+               const struct distro_arch_series *dist;
                 struct daily_download_total **totals;
                 struct daily_download_total **t_cur;
  
@@ -175,7 +179,6 @@ build_data_str(struct binary_package_publishing_history **list)
                 }
  
                 daily_download_total_list_free(totals);
-               distro_arch_series_free(dist);
         }
  
         str = strdup(json_object_to_json_string(data));
@@ -185,14 +188,15 @@ build_data_str(struct binary_package_publishing_history **list)
         return str;
  }
  
-void ppa_to_html(const char *owner, const char *ppa)
+void ppa_to_html(const char *owner, const char *ppa, const char *package_status)
  {
         struct binary_package_publishing_history **list;
         char *archive_url = get_archive_url(owner, ppa);
         char *addcolumns_str;
         char *data_str;
  
-       list = get_binary_package_publishing_history_list(archive_url);
+       list = get_binary_package_publishing_history_list(archive_url,
+                                                         package_status);
         free(archive_url);
  
         if (!list) {