renamed fct

[ppastats.git] / src / html.c

diff --git a/src/html.c b/src/html.c
index e1c9e9f..7f8a8d3 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -108,7 +108,9 @@ enum file_copy_error {
        <a href=\"index.html\">\n\
           <span id=\"ppa_owner\">N/A</span>/<span id=\"ppa_name\">N/A</span>\n\
        </a></p>\n\
-    <div id=\"chart\"></div>\n\
+    <div id=\"charts\">\n\
+       <div id=\"chart\"></div>\n\
+    </div>\n\
     <div id=\"details\">\n\
       <div class=\"distros\">\n\
        <em>Distros</em>:\n\
@@ -145,7 +147,9 @@ enum file_copy_error {
        <ul id=\"pkgs\"></ul>\n\
       </div>\n\
     </div>\n\
-    <div id=\"chart\"></div>\n\
+    <div  id=\"charts\">\n\
+       <div id=\"chart\"></div>\n\
+    </div>\n\
 %s"
 
 #define FCOPY_BUF_SZ 4096
@@ -205,11 +209,12 @@ fcopy(const char *src, const char *dst)
        return ret;
 }
 
-static char *get_path(const char *dir, const char *file)
+static char *path_new(const char *dir, const char *file, const char *suffixe)
 {
        char *path = malloc(strlen(dir)+1+
                            strlen(file)+
                            strlen(".html")+
+                           (suffixe ? strlen(suffixe) : 0) +
                            1);
 
        strcpy(path, dir);
@@ -439,7 +444,7 @@ pkg_to_html(struct ppa_stats *ppa, struct package_stats *pkg, const char *dir)
        FILE *f;
        char *json;
 
-       path = get_path(dir, pkg->name);
+       path = path_new(dir, pkg->name, ".html");
        f = fopen(path, "w");
 
        if (!f) {
@@ -469,7 +474,7 @@ version_to_html(struct ppa_stats *ppa,
        f_name = malloc(strlen(pkg->name)+1+strlen(version->version)+1);
        sprintf(f_name, "%s_%s", pkg->name, version->version);
 
-       path = get_path(dir, f_name);
+       path = path_new(dir, f_name, ".html");
        f = fopen(path, "w");
 
        if (!f) {
@@ -516,7 +521,7 @@ index_to_html(struct ppa_stats *ppa, const char *dir)
        char *path;
        FILE *f;
 
-       path = get_path(dir, "index");
+       path = path_new(dir, "index", ".html");
        f = fopen(path, "w");
 
        if (!f) {
@@ -585,7 +590,7 @@ ppa_to_html(const char *owner,
        ppastats = create_ppa_stats(owner, ppa, package_status);
        totals = ppastats->daily_download_totals;
 
-       path = get_path(output_dir, "ppa");
+       path = path_new(output_dir, "ppa", ".html");
 
        packages_to_html(ppastats, ppastats->packages, output_dir);