X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcmap%2Fsilcmap_html.c;h=cb3c475cbc875b38219d285202ba84f471212799;hb=ed46e908363484cad4403d6828aec342b4b82c10;hp=bc350c6b86e50b59523d1a2e40961c436911e606;hpb=12cf854de48f47b26378cbb08c32c0a4c9f18d87;p=silc.git diff --git a/apps/silcmap/silcmap_html.c b/apps/silcmap/silcmap_html.c index bc350c6b..cb3c475c 100644 --- a/apps/silcmap/silcmap_html.c +++ b/apps/silcmap/silcmap_html.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 2003 Pekka Riikonen + Copyright (C) 2003 - 2004 Pekka Riikonen 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 @@ -46,7 +46,7 @@ bool silc_map_writehtml(SilcMap map, SilcMapConnection mapconn) /* Write the HTML page */ - fprintf(fp, "\n"); + fprintf(fp, "\n"); fprintf(fp, "

\n"); /* General stuff */ @@ -153,7 +153,8 @@ bool silc_map_writehtml(SilcMap map, SilcMapConnection mapconn) fprintf(fp, "
\n"); begin = 0; - while (silc_gets(line, sizeof(line) - 1, pdd, pk_len + 1, &begin) != EOF) + while ((begin = silc_gets(line, sizeof(line) - 1, pdd, pk_len + 1, + begin)) != EOF) fprintf(fp, "%s
\n", line); fprintf(fp, "
\n"); @@ -215,67 +216,67 @@ bool silc_map_writehtml(SilcMap map, SilcMapConnection mapconn) if (mapconn->clients) { fprintf(fp, "  "); fprintf(fp, "Local clients : %ld\n", - mapconn->data.clients); + (unsigned long)mapconn->data.clients); } if (mapconn->channels) { fprintf(fp, "  "); fprintf(fp, "Local channels : %ld\n", - mapconn->data.channels); + (unsigned long)mapconn->data.channels); } if (mapconn->server_ops) { fprintf(fp, "  "); fprintf(fp, "Local server operators : %ld\n", - mapconn->data.server_ops); + (unsigned long)mapconn->data.server_ops); } if (mapconn->router_ops) { fprintf(fp, "  "); fprintf(fp, "Local router operators : %ld\n", - mapconn->data.router_ops); + (unsigned long)mapconn->data.router_ops); } if (mapconn->cell_clients) { fprintf(fp, "  "); fprintf(fp, "Cell clients : %ld\n", - mapconn->data.cell_clients); + (unsigned long)mapconn->data.cell_clients); } if (mapconn->cell_channels) { fprintf(fp, "  "); fprintf(fp, "Cell channels : %ld\n", - mapconn->data.cell_channels); + (unsigned long)mapconn->data.cell_channels); } if (mapconn->cell_servers) { fprintf(fp, "  "); fprintf(fp, "Cell servers : %ld\n", - mapconn->data.cell_servers); + (unsigned long)mapconn->data.cell_servers); } if (mapconn->all_clients) { fprintf(fp, "  "); fprintf(fp, "All SILC clients : %ld\n", - mapconn->data.all_clients); + (unsigned long)mapconn->data.all_clients); } if (mapconn->all_channels) { fprintf(fp, "  "); fprintf(fp, "All SILC channels : %ld\n", - mapconn->data.all_channels); + (unsigned long)mapconn->data.all_channels); } if (mapconn->all_servers) { fprintf(fp, "  "); fprintf(fp, "All SILC servers : %ld\n", - mapconn->data.all_servers); + (unsigned long)mapconn->data.all_servers); } if (mapconn->all_routers) { fprintf(fp, "  "); fprintf(fp, "All SILC routers : %ld\n", - mapconn->data.all_routers); + (unsigned long)mapconn->data.all_routers); } if (mapconn->all_server_ops) { fprintf(fp, "  "); fprintf(fp, "All SILC server operators : %ld\n", - mapconn->data.all_server_ops); + (unsigned long)mapconn->data.all_server_ops); } if (mapconn->all_router_ops) { fprintf(fp, "  "); fprintf(fp, "All SILC router operators : %ld\n", - mapconn->data.all_router_ops); + (unsigned long)mapconn->data.all_router_ops); } fprintf(fp, "\n"); } @@ -287,8 +288,8 @@ bool silc_map_writehtml(SilcMap map, SilcMapConnection mapconn) fprintf(fp, "
\n"); begin = 0; - while (silc_gets(line, sizeof(line) - 1, mapconn->data.motd, - strlen(mapconn->data.motd), &begin) != EOF) + while ((begin = silc_gets(line, sizeof(line) - 1, mapconn->data.motd, + strlen(mapconn->data.motd), begin)) != EOF) fprintf(fp, "%s
\n", line); fprintf(fp, "\n"); } @@ -317,7 +318,7 @@ bool silc_map_writehtml_index(SilcMap map) /* Produce a simple HTML index file of all servers */ class = map->writehtml.text ? map->writehtml.text : "silcmap"; - fprintf(fp, "\n"); + fprintf(fp, "\n"); fprintf(fp, "
\n"); fprintf(fp, "\n", class); @@ -373,6 +374,10 @@ bool silc_map_writemaphtml(SilcMap map) for (i = 0; i < map->writemaphtml_count; i++) { c = &map->writemaphtml[i]; + if (c->alon && c->alat) { + c->x = silc_map_lon2x(map, c->alon); + c->y = silc_map_lat2y(map, c->alat); + } /* Open for writing */ fp = fopen(c->filename, "w+"); @@ -388,7 +393,7 @@ bool silc_map_writemaphtml(SilcMap map) memset(url, 0, sizeof(url)); - fprintf(fp, "\n"); + fprintf(fp, "\n"); fprintf(fp, "\n", c->text); fprintf(fp, "\n"); @@ -408,6 +413,11 @@ bool silc_map_writemaphtml(SilcMap map) /* Print the positions of various items on the map into the map file */ silc_dlist_start(mapconn->commands); while ((cmd = silc_dlist_get(mapconn->commands)) != SILC_LIST_END) { + if (cmd->alon && cmd->alat) { + cmd->x = silc_map_lon2x(map, cmd->alon); + cmd->y = silc_map_lat2y(map, cmd->alat); + } + if (cmd->draw_text) { w = strlen(cmd->text) * 5; h = map->font.height - 2; @@ -516,7 +526,7 @@ bool silc_map_writerelhtml(SilcMap map) /* Produce the reliability graph as HTML file. */ class = map->writerel.text ? map->writerel.text : "silcmap"; - fprintf(fp, "\n"); + fprintf(fp, "\n"); fprintf(fp, "
\n"); fprintf(fp, "
\n", class); @@ -546,7 +556,7 @@ bool silc_map_writerelhtml(SilcMap map) /* Count the reliability */ if (try) - rel = ((double)success / (double)try) * (double)190.0; + rel = ((double)success / (double)try) * (double)160.0; fprintf(fp, "\n"); if (mapconn->html_url) @@ -556,14 +566,14 @@ bool silc_map_writerelhtml(SilcMap map) fprintf(fp, "\n", class, hostname, mapconn->port, hostname); fprintf(fp, - "
 %s" - "" + "\n" "\n" "\n", - class, class, rel, 190 - rel, class, + class, class, rel, 160 - rel, class, ((double)success / (double)try) * (double)100.0, success); }
" + "" "" "" "
%.2f%% - score: %d