X-Git-Url: http://royale.zerezo.com/git/?p=irssistats;a=blobdiff_plain;f=irssistats.c;h=d7e974ddcf0a7095dd430e9ce857dc303eabd9fe;hp=ae6b2a80e23275dd1a2bbced737cf680634532f6;hb=f1ceb8590964e5e54ebe293d580a16ec28f161e0;hpb=363a540f2233a72f1dccd300f93514d009e2053b diff --git a/irssistats.c b/irssistats.c index ae6b2a8..d7e974d 100644 --- a/irssistats.c +++ b/irssistats.c @@ -1,4 +1,27 @@ -/* Usage: irssistats [/path/to/file.conf] */ +/* + * irssistats version 0.62 + * + * This tool generates IRC stats based on irssi logs. + * Usage: irssistats [/path/to/file.conf] + * + * Copyright (C) 2002-2004 Antoine Jacquet + * http://royale.zerezo.com/irssistats/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include #include @@ -8,7 +31,7 @@ #include /* Config */ -#define MAXUSERS 10000 +#define BASEUSERS 1000 #define MAXNICKLENGTH 50 #define MAXLINELENGTH 2000 #define MAXQUOTELENGTH 100 @@ -20,7 +43,7 @@ #define MINWORDLENGTH 5 /* irssistats */ -#define VERSION "0.5" +#define VERSION "0.62" #define URL "http://royale.zerezo.com/irssistats/" /* Counters */ @@ -41,12 +64,13 @@ char *counters[NBCOUNTERS]={"C_SMILE","C_FROWN","C_EXCLAM","C_QUESTION","C_ME","C_TOPIC","C_MODE","C_KICK","C_KICKED","C_URL","C_JOIN","C_NICK","C_MONOLOGUE"}; /* Languages */ -#define NBLANGUAGES 8 -#define NBKEYS 38 +#define NBLANGUAGES 11 +#define NBKEYS 39 char *keys[NBLANGUAGES][NBKEYS+1][2]= /* first key used for language name and abbreviation */ { { /* English language */ { "English", "en" }, + { "CHARSET", "ISO-8859-1" }, { "HEADER", "Statistics for %s by %s" }, { "LEGEND", "Legend" }, { "LASTDAYS", "Lastdays statistics" }, @@ -88,6 +112,7 @@ char *keys[NBLANGUAGES][NBKEYS+1][2]= /* first key used for language name and ab }, { /* French language */ { "French", "fr" }, + { "CHARSET", "ISO-8859-1" }, { "HEADER", "Statistiques de %s par %s" }, { "LEGEND", "Légende" }, { "LASTDAYS", "Statistiques des derniers jours" }, @@ -130,6 +155,7 @@ char *keys[NBLANGUAGES][NBKEYS+1][2]= /* first key used for language name and ab { /* German language */ /* contributed by Valentin Gelhorn */ { "German", "de" }, + { "CHARSET", "ISO-8859-1" }, { "HEADER", "Statistiken für %s von %s" }, { "LEGEND", "Legende" }, { "LASTDAYS", "Statistik der letzten Tage" }, @@ -172,6 +198,7 @@ char *keys[NBLANGUAGES][NBKEYS+1][2]= /* first key used for language name and ab { /* Spanish language */ /* contributed by Alex */ { "Spanish", "es" }, + { "CHARSET", "ISO-8859-1" }, { "HEADER", "Estadísticas de %s por %s" }, { "LEGEND", "Leyenda" }, { "LASTDAYS", "Estadísticas de los últimos días" }, @@ -212,8 +239,52 @@ char *keys[NBLANGUAGES][NBKEYS+1][2]= /* first key used for language name and ab { "C_MONOLOGUE", "Habla solo" } }, { /* Polish language */ - /* contributed by Piotr Jarmuz */ + /* contributed by Jakub Jankowski */ { "Polish", "pl" }, + { "CHARSET", "ISO-8859-2" }, + { "HEADER", "Statystyki dla %s zebrane przez %s" }, + { "LEGEND", "Legenda" }, + { "LASTDAYS", "Statystyki z ostatnich dni" }, + { "TOPHOURS", "Statystyki godzinowe" }, + { "TOPUSERS", "Najaktywniejsi" }, + { "OTHERS", "Jest jeszcze %d nie sklasyfikowanych..." }, + { "NBLINES", "linii" }, + { "NICK", "nick" }, + { "AVGLETTERS", "liter/liniê" }, + { "HOURS", "godziny" }, + { "QUOTE", "losowa wypowied¼" }, + { "TOPUSERSTIME", "Najaktywniejsi wed³ug pory dnia" }, + { "RANDTOPICS", "Kilka topików" }, + { "CHANGEDBY", "ustawiony przez" }, + { "NEWTOPIC", "topik" }, + { "RANDURLS", "Kilka URL-i" }, + { "POSTEDBY", "poda³(a)" }, + { "POSTEDURL", "URL" }, + { "TOPWORDS", "Najczê¶ciej wystêpuj±ce s³owa" }, + { "WORD", "s³owo" }, + { "OCCURRENCES", "wyst±pieñ" }, + { "BIGNUMBERS", "Kilka wielkopomnych liczb..." }, + { "NUMBERS", "kategorie" }, + { "TIME", "Dokonano analizy %d linii (obejmuj±cych %d dni) w czasie %d sekund" }, + { "FOOTER", "Statystyki wygenerowane przez" }, + { "C_SMILE", "jest czêsto szczesliwy(a) :)" }, + { "C_FROWN", "jest czêsto smutny(a) :(" }, + { "C_EXCLAM", "czêsto KRZYCZY!" }, + { "C_QUESTION", "zadaje du¿o pytañ?" }, + { "C_ME", "lubi u¿ywaæ /me" }, + { "C_TOPIC", "czêsto zmienia topik" }, + { "C_MODE", "czêsto zmienia tryby kana³u" }, + { "C_KICK", "lubi kopaæ" }, + { "C_KICKED", "czêsto wykopywany(a)" }, + { "C_URL", "podaje du¿o URL-i" }, + { "C_JOIN", "nie wie czy zostaæ, czy wyj¶æ" }, + { "C_NICK", "czêsto zmienia nick" }, + { "C_MONOLOGUE", "uwielbia monologi" } + }, + { /* Polish language */ + /* contributed by Piotr Jarmuz */ + { "Polish", "pl-old" }, + { "CHARSET", "ISO-8859-1" }, { "HEADER", "Statystyki dla %s przez %s" }, { "LEGEND", "Legenda" }, { "LASTDAYS", "Statystyki z ostatnich dni" }, @@ -256,6 +327,7 @@ char *keys[NBLANGUAGES][NBKEYS+1][2]= /* first key used for language name and ab { /* Finnish language */ /* contributed by Antti Huopana */ { "Finnish", "fi" }, + { "CHARSET", "ISO-8859-1" }, { "HEADER", "Kanavan %s tilastot - %s" }, { "LEGEND", "Merkkien selitykset" }, { "LASTDAYS", "Viime päivien tilastot" }, @@ -298,6 +370,7 @@ char *keys[NBLANGUAGES][NBKEYS+1][2]= /* first key used for language name and ab { /* Italian language */ /* contributed by Coviello Giuseppe */ { "Italian", "it" }, + { "CHARSET", "ISO-8859-1" }, { "HEADER", "Statistiche per il canale %s di %s" }, { "LEGEND", "Legenda" }, { "LASTDAYS", "Statistiche degli ultimi giorni" }, @@ -340,6 +413,7 @@ char *keys[NBLANGUAGES][NBKEYS+1][2]= /* first key used for language name and ab { /* Dutch language */ /* contributed by Jeroen Ubbink */ { "Dutch", "nl" }, + { "CHARSET", "ISO-8859-1" }, { "HEADER", "Statistieken voor %s door %s" }, { "LEGEND", "Legenda" }, { "LASTDAYS", "Statistieken van de laatste dagen" }, @@ -378,7 +452,93 @@ char *keys[NBLANGUAGES][NBKEYS+1][2]= /* first key used for language name and ab { "C_JOIN", "twijfelt tussen blijven of gaan" }, { "C_NICK", "verandert vaak van nick" }, { "C_MONOLOGUE", "spreekt veel monologen" } - } + }, + { /* Russian language */ + /* contributed by kamikaze */ + { "Russian", "ru" }, + { "CHARSET", "KOI8-R" }, + { "HEADER", "óÔÁÔÉÓÔÉËÁ ÄÌÑ %s ÏÔ %s" }, + { "LEGEND", "ïÂÏÚÎÁÞÅÎÉÑ" }, + { "LASTDAYS", "óÔÁÔÉÓÔÉËÁ ÐÏÓÌÅÄÎÉÈ ÄÎÅÊ" }, + { "TOPHOURS", "ðÏÞÁÓÏ×ÁÑ ÓÔÁÔÉÓÔÉËÁ" }, + { "TOPUSERS", "áËÔÉ×ÎÅÊÛÉÅ ÌÀÄÉ" }, + { "OTHERS", "ïÓÔÁÌÏÓØ %d ÎÅÐÏÄÓÞÉÔÁÎÙÈ..." }, + { "NBLINES", "ÓÔÒÏËÉ" }, + { "NICK", "ÎÉË" }, + { "AVGLETTERS", "ÂÕË×Ù/ÓÔÒÏËÉ" }, + { "HOURS", "ÞÁÓÙ" }, + { "QUOTE", "ÓÌÕÞÁÊÎÏÅ ÓÏÏÂÝÅÎÉÅ" }, + { "TOPUSERSTIME", "áËÔÉ×ÎÅÊÛÉÅ ÌÀÄÉ ÐÏ ×ÒÅÍÅÎÉ ÄÎÑ" }, + { "RANDTOPICS", "îÅÓËÏÌØËÏ ÔÏÐÉËÏ×" }, + { "CHANGEDBY", "ÉÚÍÅΣÎ" }, + { "NEWTOPIC", "ÎÏ×ÙÊ ÔÏÐÉË" }, + { "RANDURLS", "îÅÓËÏÌØËÏ URLÏ×" }, + { "POSTEDBY", "ÏÐÕÂÌÉËÏ×ÁÌ" }, + { "POSTEDURL", "URL" }, + { "TOPWORDS", "þÁÓÔÏ ÉÓÐÏÌØÚÕÅÍÙÅ ÓÌÏ×Á" }, + { "WORD", "ÓÌÏ×Ï" }, + { "OCCURRENCES", "ÐÒÏÉÛÅÓÔ×ÉÑ" }, + { "BIGNUMBERS", "îÅÓËÏÌØËÏ ÂÏÌØÛÉÈ ÞÉÓÅÌ..." }, + { "NUMBERS", "ÞÉÓÌÁ" }, + { "TIME", "%d ÓÔÒÏË (%d ÄÎÅÊ) ÏÂÒÁÂÏÔÁÎÏ ÚÁ %d ÓÅËÕÎÄ" }, + { "FOOTER", "óÔÁÔÉÓÔÉËÁ ÓÇÅÎÅÒÉÒÏ×ÁÎÁ" }, + { "C_SMILE", "ÞÁÓÔÏ ÓÞÁÓÌÉ× :)" }, + { "C_FROWN", "ÞÁÓÔÏ ÎÅÓÞÁÓÔÅÎ :(" }, + { "C_EXCLAM", "ÍÎÏÇÏ ×ÏÓËÌÉÃÁÅÔ !" }, + { "C_QUESTION", "ÚÁÄÁ£Ô ÍÎÏÇÏ ×ÏÐÒÏÓÏ× ?" }, + { "C_ME", "ÌÀÂÉÔ /me command" }, + { "C_TOPIC", "ÞÁÓÔÏ ÍÅÎÑÅÔ ÔÏÐÉË" }, + { "C_MODE", "ÞÁÓÔÏ ÍÅÎÑÅÔ ÒÅÖÉÍÙ" }, + { "C_KICK", "ÌÀÂÉÔ /kick" }, + { "C_KICKED", "ÞÁÓÔÏ ×ÙËÉÄÙ×ÁÀÔ" }, + { "C_URL", "ÐÕÂÌÉËÕÅÔ ÍÎÏÇÏ URLÏ×" }, + { "C_JOIN", "ÎÅ ÚÎÁÅÔ - ÏÓÔÁÔØÓÑ ÉÌÉ ÕÊÔÉ" }, + { "C_NICK", "ÞÁÓÔÏ ÍÅÎÑÅÔ Ó×ÏÊ ÎÉË" }, + { "C_MONOLOGUE", "éÓÐÏÌØÚÕÅÔ ÍÎÏÇÏ ÍÏÎÏÌÏÇÏ×" } + }, + { /* Estonian language */ + /* contributed by Martin Vool */ + { "Estonian", "et" }, + { "CHARSET", "ISO-8859-4" }, + { "HEADER", "Statistika kanalile %s on koostanud %s" }, + { "LEGEND", "Legend" }, + { "LASTDAYS", "Viimaste päevade statistika" }, + { "TOPHOURS", "Tunni statistika" }, + { "TOPUSERS", "Kõige aktiivsemad inimesed" }, + { "OTHERS", "%d inimest on rääkinud" }, + { "NBLINES", "rida" }, + { "NICK", "nimi" }, + { "AVGLETTERS", "tähte/rida" }, + { "HOURS", "kell" }, + { "QUOTE", "suvaline teade" }, + { "TOPUSERSTIME", "Kõige aktiivsemad inimesed päeva aja järgi" }, + { "RANDTOPICS", "Mõned topicud" }, + { "CHANGEDBY", "muutis" }, + { "NEWTOPIC", "topicud" }, + { "RANDURLS", "Mõned aadressid" }, + { "POSTEDBY", "postitas" }, + { "POSTEDURL", "URL" }, + { "TOPWORDS", "Enim kasutatud sõnad" }, + { "WORD", "sõna" }, + { "OCCURRENCES", "sagedus" }, + { "BIGNUMBERS", "Mõned suured numbrid" }, + { "NUMBERS", "iseloom" }, + { "TIME", "%d rida (%d päeva) on möödunud %d sekundit" }, + { "FOOTER", "Statistika on koostanud" }, + { "C_SMILE", "on tihti õnnelik :)" }, + { "C_FROWN", "on tihti kurb :(" }, + { "C_EXCLAM", "põrnitseb palju" }, + { "C_QUESTION", "küsib palju küsimusi" }, + { "C_ME", "/me manjakk" }, + { "C_TOPIC", "vahetab tihti topicut" }, + { "C_MODE", "vahetab tihti modesid" }, + { "C_KICK", "kickib palju" }, + { "C_KICKED", "saab tihti kicke" }, + { "C_URL", "reklaamib palju" }, + { "C_JOIN", "sõelub sisse ja välja" }, + { "C_NICK", "vahetab pidevalt nime" }, + { "C_MONOLOGUE", "räägib palju monolooge" } + } }; int language=0; /* default to english */ @@ -396,39 +556,44 @@ char *L(char *key) int debug=1; /* 0 = none ; 1 = normal ; 2 = verbose */ char channel[MAXLINELENGTH]="set_channel_in_config_file"; char maintainer[MAXLINELENGTH]="set_maintainer_in_config_file"; -char theme[MAXLINELENGTH]="default"; +char theme[MAXLINELENGTH]="default,blue,dark,grayscale,namour,pisg,zeduel,zerezo"; int refresh_time=0; /* 0 = disabled */ int w3c_link=1; /* 0 = disabled */ char header[MAXLINELENGTH]="none"; char footer[MAXLINELENGTH]="none"; int totallines=0; time_t debut; +int top_words=1; /* 0 = disabled */ +int ranking=0; /* 0 = lines ; 1 = words ; 2 = letters */ +int quarter=0; /* 1 = enabled */ -struct +struct user { char nick[MAXNICKLENGTH]; int lines; + int words; int letters; int hours[4]; char quote[MAXQUOTELENGTH+1]; int counters[NBCOUNTERS]; int temp; -} users[MAXUSERS]; +} *users; int nbusers=0; +int maxusers=BASEUSERS; struct { char nick[MAXNICKLENGTH]; char url[MAXLINELENGTH]; char shorturl[MAXQUOTELENGTH+1]; -} urls[5]; +} urls[NBURLS]; int nburls=0; struct { char nick[MAXNICKLENGTH]; char topic[MAXQUOTELENGTH+1]; -} topics[5]; +} topics[NBTOPICS]; int nbtopics=0; struct @@ -438,7 +603,7 @@ struct } lastdays[31]; int days=0; -int hours[24]; +int hours[24*4]; int lines=0; struct letter @@ -455,13 +620,13 @@ struct #define isletter(c) (((c>='a')&&(c<='z'))||((c>='A')&&(c<='Z'))) #define lowercase(c) (((c>='A')&&(c<='Z'))?c-'A'+'a':c) -void findwords(char *message) +int findwords(char *message) { - int i,c; + int i,c,n=0; struct letter *pos,*tmp; for (;;) { - while (!isletter(*message)) if (*message=='\0') return; else message++; + while (!isletter(*message)) if (*message=='\0') return n; else message++; pos=&words; while (isletter(*message)) { @@ -469,6 +634,11 @@ void findwords(char *message) if (pos->next[(int)c]==NULL) { tmp=malloc(sizeof(struct letter)); + if (tmp==NULL) + { + fprintf(stderr, "findwords(): malloc failure\n"); + exit(1); + } tmp->nb=0; for (i=0;i<26;i++) tmp->next[i]=NULL; pos->next[(int)c]=tmp; @@ -477,8 +647,9 @@ void findwords(char *message) message++; } pos->nb++; + n++; } - return; + return n; } char tempword[MAXLINELENGTH]; @@ -542,11 +713,17 @@ int dichotomic(char *nick) if (strcmp(nick,users[start].nick)!=0) { nbusers++; - if (nbusers>=MAXUSERS) { fprintf(stderr,"too many users\n"); exit(1); } + if (nbusers>=maxusers) + { + maxusers+=BASEUSERS; + if (debug==2) fprintf(stderr,"allocating more users : %d\n",maxusers); + if ((users=realloc(users,maxusers*sizeof(struct user)))==NULL) { fprintf(stderr,"too many users : unable to realloc memory\n"); exit(1); } + } for (i=nbusers-1;i>start;i--) { strcpy(users[i].nick,users[i-1].nick); users[i].lines=users[i-1].lines; + users[i].words=users[i-1].words; users[i].letters=users[i-1].letters; for (j=0;j<4;j++) users[i].hours[j]=users[i-1].hours[j]; strcpy(users[i].quote,users[i-1].quote); @@ -555,6 +732,7 @@ int dichotomic(char *nick) } strcpy(users[start].nick,nick); users[start].lines=0; + users[start].words=0; users[start].letters=0; for (j=0;j<4;j++) users[start].hours[j]=0; users[start].quote[0]='\0'; @@ -694,11 +872,17 @@ void parse_log(char *logfile) } j=strlen(message); users[i].lines++; + if (top_words || ranking==1) users[i].words+=findwords(message); users[i].letters+=j; users[i].hours[hour/6]++; lastdays[0].lines++; lastdays[0].hours[hour/6]++; lines++; + if (quarter) + { + line[5]='\0'; + hour=hour*4+atoi(&line[3])/15; + } hours[hour]++; if (message[j-1]=='?') users[i].counters[D_QUESTION]++; else if (message[j-1]=='!') users[i].counters[D_EXCLAM]++; @@ -722,7 +906,6 @@ void parse_log(char *logfile) strncpy(urls[temp].shorturl,message,MAXQUOTELENGTH); } } - findwords(message); } pos=0; } @@ -753,11 +936,13 @@ void parse_nick(char *nickfile) users[user].temp=users[i].temp; } users[user].lines+=users[i].lines; + users[user].words+=users[i].words; users[user].letters+=users[i].letters; for (j=0;j<4;j++) users[user].hours[j]+=users[i].hours[j]; for (j=0;j"); users[i].lines=-1; + users[i].words=-1; users[i].letters=-1; for (j=0;j<4;j++) users[i].hours[j]=-1; for (j=0;j\n\n",VERSION,URL); fprintf(fic,"\n\n\n"); fprintf(fic,L("HEADER"),channel,maintainer); - fprintf(fic,"\n\n"); + fprintf(fic,"\n\n",L("CHARSET")); if (refresh_time) fprintf(fic,"\n",refresh_time); - fprintf(fic,"\n",theme); + subtheme=strtok(theme,","); + fprintf(fic,"\n",subtheme,subtheme); + while ((subtheme=strtok(NULL,","))!=NULL) + fprintf(fic,"\n",subtheme,subtheme); fprintf(fic,"\n\n"); fprintf(fic,"\n\n"); } @@ -818,7 +1008,7 @@ void gen_xhtml(char *xhtmlfile) for (i=30;i>=0;i--) if (lastdays[i].lines>max) max=lastdays[i].lines; for (i=30;i>=0;i--) { - fprintf(fic,"%d",lastdays[i].lines); /* width=\"15\" */ + fprintf(fic,"%d",lastdays[i].lines); for (j=0;j<4;j++) if (lastdays[i].hours[j]!=0) fprintf(fic,"
",j+1,150*lastdays[i].hours[j]/max); fprintf(fic,"\n"); } @@ -830,34 +1020,74 @@ void gen_xhtml(char *xhtmlfile) /* top hours */ fprintf(fic,"
\n

%s

\n\n\n",L("TOPHOURS")); max=-1; - for (i=0;i<24;i++) if (hours[i]>max) max=hours[i]; - for (i=0;i<24;i++) + for (i=0;i<24*4;i++) if (hours[i]>max) max=hours[i]; + if (quarter) for (i=0;i<24*4;i++) + { + fprintf(fic,"\n"); + } + else for (i=0;i<24;i++) { - fprintf(fic,"\n"); } fprintf(fic,"\n\n"); for (i=0;i<24;i++) - fprintf(fic,"\n",i); + if (quarter) fprintf(fic,"\n",i); + else fprintf(fic,"\n",i); fprintf(fic,"\n
"); + if (hours[i]!=0) fprintf(fic,"
",i/4/6+1,150*hours[i]/max); + fprintf(fic,"		%.1f%%",lines!=0?(float)100*hours[i]/lines:0); /* width=\"15\" */ + fprintf(fic,"%.1f%%",lines!=0?(float)100*hours[i]/lines:0); if (hours[i]!=0) fprintf(fic,"
",i/6+1,150*hours[i]/max); fprintf(fic,"
%d%d%d
\n
\n\n"); /* top users */ fprintf(fic,"
\n

%s

\n",L("TOPUSERS")); - fprintf(fic,"\n\n",L("NICK"),L("NBLINES"),L("HOURS"),L("AVGLETTERS"),L("QUOTE")); + switch (ranking) + { + case 0: + fprintf(fic,"
%s%s%s%s%s
\n\n",L("NICK"),L("NBLINES"),L("HOURS"),L("AVGLETTERS"),L("QUOTE")); + break; + default: + /* "letters" and "words" ranking are not yet translated so we use the generic word "rank" ... */ + fprintf(fic,"
%s%s%s%s%s
\n\n",L("NICK"),"rank",L("HOURS"),L("AVGLETTERS"),L("QUOTE")); + break; + } for (i=1;i<=NBUSERS;i++) { user=-1; max=0; - for (j=0;jmax) max=users[user=j].lines; + switch (ranking) + { + case 0: + for (j=0;jmax) max=users[user=j].lines; + break; + case 1: + for (j=0;jmax) max=users[user=j].words; + break; + case 2: + for (j=0;jmax) max=users[user=j].letters; + break; + } if (user!=-1) { - fprintf(fic,"\n"); users[user].lines=-1; + users[user].words=-1; + users[user].letters=-1; } } fprintf(fic,"
%s%s%s%s%s
%d%s%d",i,users[user].nick,users[user].lines); + switch (ranking) + { + case 0: + fprintf(fic,"
%d%s%d",i,users[user].nick,users[user].lines); + break; + case 1: + fprintf(fic,"
%d%s%d",i,users[user].nick,users[user].words); + break; + case 2: + fprintf(fic,"
%d%s%d",i,users[user].nick,users[user].letters); + break; + } for (j=0;j<4;j++) if (users[user].hours[j]!=0) fprintf(fic,"
",j+1,100*users[user].hours[j]/users[user].lines); fprintf(fic,"		%d
\"",users[user].lines!=0?users[user].letters/users[user].lines:0,users[user].lines!=0?users[user].letters/users[user].lines:0); printhtml(fic,users[user].quote); fprintf(fic,"\"
\n"); @@ -920,12 +1150,15 @@ void gen_xhtml(char *xhtmlfile) fprintf(fic,"\n
\n\n"); /* top words */ - fprintf(fic,"
\n

%s

\n",L("TOPWORDS")); - fprintf(fic,"\n\n",L("WORD"),L("OCCURRENCES")); - for (i=0;i\n",i+1,topwords[i].word,topwords[i].nb); - fprintf(fic,"
%s%s
%d\"%s\"%d
\n
\n\n"); - + if (top_words) + { + fprintf(fic,"
\n

%s

\n",L("TOPWORDS")); + fprintf(fic,"\n\n",L("WORD"),L("OCCURRENCES")); + for (i=0;i\n",i+1,topwords[i].word,topwords[i].nb); + fprintf(fic,"
%s%s
%d\"%s\"%d
\n
\n\n"); + } + /* big numbers */ fprintf(fic,"
\n

%s

\n",L("BIGNUMBERS")); fprintf(fic,"\n\n",L("NICK"),L("NUMBERS"),L("NBLINES")); @@ -1006,7 +1239,8 @@ void parse_config(char *configfile) else if (strcmp("verbose",value)==0) { debug=2; fprintf(stderr,"switching to verbose output\n"); } else { fprintf(stderr,"unknown value for \"debug\" option, must be \"normal\", \"verbose\" or \"none\"\n"); exit(1); } - } else + } + else if (strcmp("channel",keyword)==0) { @@ -1098,14 +1332,43 @@ void parse_config(char *configfile) nburls=0; nbtopics=0; days=0; - for (i=0;i<24;i++) hours[i]=0; + for (i=0;i<24*4;i++) hours[i]=0; lines=0; freewords(&words); for (i=0;i
%s%s%s