Bump version.

[ps-cgit] / ui-stats.c

diff --git a/ui-stats.c b/ui-stats.c
index 480c8eec33734d71787b17aa30b019e553a79e6d..bc273088a4ee2a34daf9da2a33b5578c2255740a 100644 (file)
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -1,7 +1,7 @@
 #include "cgit.h"
 #include "cgit.h"

+#include "ui-stats.h"

 #include "html.h"
 #include "ui-shared.h"
 #include "html.h"
 #include "ui-shared.h"

-#include "ui-stats.h"

 
 #ifdef NO_C99_FORMAT
 #define SZ_FMT "%u"
 
 #ifdef NO_C99_FORMAT
 #define SZ_FMT "%u"


@@ -9,8 +9,6 @@
 #define SZ_FMT "%zu"
 #endif
 
 #define SZ_FMT "%zu"
 #endif
 

-#define MONTHS 6
-

 struct authorstat {
        long total;
        struct string_list list;
 struct authorstat {
        long total;
        struct string_list list;


@@ -211,13 +209,12 @@ static int cmp_total_commits(const void *a1, const void *a2)
 /* Walk the commit DAG and collect number of commits per author per
  * timeperiod into a nested string_list collection.
  */
 /* Walk the commit DAG and collect number of commits per author per
  * timeperiod into a nested string_list collection.
  */

-static struct string_list collect_stats(struct cgit_context *ctx,
-                                       struct cgit_period *period)
+static struct string_list collect_stats(struct cgit_period *period)

 {
        struct string_list authors;
        struct rev_info rev;
        struct commit *commit;
 {
        struct string_list authors;
        struct rev_info rev;
        struct commit *commit;

-       const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL};
+       const char *argv[] = {NULL, ctx.qry.head, NULL, NULL, NULL, NULL};

        int argc = 3;
        time_t now;
        long i;
        int argc = 3;
        time_t now;
        long i;


@@ -231,9 +228,9 @@ static struct string_list collect_stats(struct cgit_context *ctx,
                period->dec(tm);
        strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm);
        argv[2] = xstrdup(fmt("--since=%s", tmp));
                period->dec(tm);
        strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm);
        argv[2] = xstrdup(fmt("--since=%s", tmp));

-       if (ctx->qry.path) {
+       if (ctx.qry.path) {

                argv[3] = "--";
                argv[3] = "--";

-               argv[4] = ctx->qry.path;
+               argv[4] = ctx.qry.path;

                argc += 2;
        }
        init_revisions(&rev, NULL);
                argc += 2;
        }
        init_revisions(&rev, NULL);


@@ -362,31 +359,30 @@ static void print_authors(struct string_list *authors, int top,
  * for each author is another string_list which is used to calculate the
  * number of commits per time-interval.
  */
  * for each author is another string_list which is used to calculate the
  * number of commits per time-interval.
  */

-void cgit_show_stats(struct cgit_context *ctx)
+void cgit_show_stats(void)

 {
        struct string_list authors;
        struct cgit_period *period;
        int top, i;
        const char *code = "w";
 
 {
        struct string_list authors;
        struct cgit_period *period;
        int top, i;
        const char *code = "w";
 

-       if (ctx->qry.period)
-               code = ctx->qry.period;
+       if (ctx.qry.period)
+               code = ctx.qry.period;

 
        i = cgit_find_stats_period(code, &period);
        if (!i) {
 
        i = cgit_find_stats_period(code, &period);
        if (!i) {

-               cgit_print_error(fmt("Unknown statistics type: %c", code[0]));
+               cgit_print_error("Unknown statistics type: %c", code[0]);

                return;
        }
                return;
        }

-       if (i > ctx->repo->max_stats) {
-               cgit_print_error(fmt("Statistics type disabled: %s",
-                                    period->name));
+       if (i > ctx.repo->max_stats) {
+               cgit_print_error("Statistics type disabled: %s", period->name);

                return;
        }
                return;
        }

-       authors = collect_stats(ctx, period);
+       authors = collect_stats(period);

        qsort(authors.items, authors.nr, sizeof(struct string_list_item),
                cmp_total_commits);
 
        qsort(authors.items, authors.nr, sizeof(struct string_list_item),
                cmp_total_commits);
 

-       top = ctx->qry.ofs;
+       top = ctx.qry.ofs;

        if (!top)
                top = 10;
 
        if (!top)
                top = 10;
 


@@ -395,10 +391,10 @@ void cgit_show_stats(struct cgit_context *ctx)
        html("<form method='get' action=''>");
        cgit_add_hidden_formfields(1, 0, "stats");
        html("<table><tr><td colspan='2'/></tr>");
        html("<form method='get' action=''>");
        cgit_add_hidden_formfields(1, 0, "stats");
        html("<table><tr><td colspan='2'/></tr>");

-       if (ctx->repo->max_stats > 1) {
+       if (ctx.repo->max_stats > 1) {

                html("<tr><td class='label'>Period:</td>");
                html("<td class='ctrl'><select name='period' onchange='this.form.submit();'>");
                html("<tr><td class='label'>Period:</td>");
                html("<td class='ctrl'><select name='period' onchange='this.form.submit();'>");

-               for (i = 0; i < ctx->repo->max_stats; i++)
+               for (i = 0; i < ctx.repo->max_stats; i++)

                        html_option(fmt("%c", periods[i].code),
                                    periods[i].name, fmt("%c", period->code));
                html("</select></td></tr>");
                        html_option(fmt("%c", periods[i].code),
                                    periods[i].name, fmt("%c", period->code));
                html("</select></td></tr>");


@@ -417,9 +413,9 @@ void cgit_show_stats(struct cgit_context *ctx)
        html("</form>");
        html("</div>");
        htmlf("<h2>Commits per author per %s", period->name);
        html("</form>");
        html("</div>");
        htmlf("<h2>Commits per author per %s", period->name);

-       if (ctx->qry.path) {
+       if (ctx.qry.path) {

                html(" (path '");
                html(" (path '");

-               html_txt(ctx->qry.path);
+               html_txt(ctx.qry.path);

                html("')");
        }
        html("</h2>");
                html("')");
        }
        html("</h2>");