removed a bunch of blank comment lines

[citadel.git] / webcit / sitemap.c

diff --git a/webcit/sitemap.c b/webcit/sitemap.c
index 4d154632df09fd4cd1478e654b90f8511a813fae..0835c366abf631c4188a0afd68d1f796202c609c 100644 (file)
--- a/webcit/sitemap.c
+++ b/webcit/sitemap.c
@@ -1,21 +1,15 @@
 /*
  * XML sitemap generator
  *
- * Copyright (c) 2010-2011 by the citadel.org team
+ * Copyright (c) 2010-2012 by the citadel.org team
  *
  * This program is open source 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 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License, version 3.
  *
  * 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 "webcit.h"
@@ -36,7 +30,7 @@ void sitemap_do_bbs(void) {
        Stat.maxload = INT_MAX;
        Stat.lowest_found = (-1);
        Stat.highest_found = (-1);
-       num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
+       num_msgs = load_msg_ptrs("MSGS ALL", NULL, &Stat, NULL);
        if (num_msgs < 1) return;
 
        for (i=0; i<num_msgs; i+=20) {
@@ -66,7 +60,7 @@ void sitemap_do_blog(void) {
        Stat.maxload = INT_MAX;
        Stat.lowest_found = (-1);
        Stat.highest_found = (-1);
-       num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
+       num_msgs = load_msg_ptrs("MSGS ALL", NULL, &Stat, NULL);
        if (num_msgs < 1) return;
 
        for (i=0; i<num_msgs; ++i) {
@@ -100,7 +94,7 @@ void sitemap_do_wiki(void) {
        Stat.maxload = INT_MAX;
        Stat.lowest_found = (-1);
        Stat.highest_found = (-1);
-       num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
+       num_msgs = load_msg_ptrs("MSGS ALL", NULL, &Stat, NULL);
        if (num_msgs < 1) return;
 
        for (i=0; i<num_msgs; ++i) {
@@ -125,16 +119,41 @@ void sitemap_do_wiki(void) {
 }
 
 
+struct sitemap_room_list {
+       struct sitemap_room_list *next;
+       StrBuf *roomname;
+       int defview;
+};
+
+
+/*
+ * Load the room list for the sitemap
+ */
+struct sitemap_room_list *sitemap_load_roomlist(void) {
+       char buf[SIZ];
+       char roomname_plain[SIZ];
+       struct sitemap_room_list *roomlist = NULL;
+
+       serv_puts("LKRA");
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+               struct sitemap_room_list *ptr = malloc(sizeof(struct sitemap_room_list));
+               extract_token(roomname_plain, buf, 0, '|', sizeof roomname_plain);
+               ptr->roomname = NewStrBufPlain(roomname_plain, -1);
+               ptr->defview = extract_int(buf, 6);
+               ptr->next = roomlist;
+               roomlist = ptr;
+       }
+
+       return(roomlist);
+}
+
+
 /*
  * Entry point for RSS feed generator
  */
 void sitemap(void) {
-       HashList *roomlist = NULL;
-       HashPos *it = NULL;
-       long HKlen = 0;
-       const char *HashKey = NULL;
-       folder *room = NULL;
-
+       struct sitemap_room_list *roomlist = NULL;
        output_headers(0, 0, 0, 0, 1, 0);
        hprintf("Content-type: text/xml\r\n");
        hprintf(
@@ -148,17 +167,14 @@ void sitemap(void) {
        wc_printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
        wc_printf("<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\r\n");
 
-       roomlist = GetRoomListHash(NULL, NULL);
-       if (!roomlist) syslog(LOG_CRIT, "GetRoomListHash() FAILED!");
-       it = GetNewHashPos(roomlist, 0);
-       if (!it) syslog(LOG_CRIT, "GetNewHashPos() FAILED!");
+       roomlist = sitemap_load_roomlist();
 
-       while (GetNextHashPos(roomlist, it, &HKlen, &HashKey, (void *)&room))
+       while (roomlist != NULL)
        {
-               gotoroom(room->name);
+               gotoroom(roomlist->roomname);
 
                /* Output the messages in this room only if it's a room type we can make sense of */
-               switch(room->defview) {
+               switch(roomlist->defview) {
                        case VIEW_BBS:
                                sitemap_do_bbs();
                                break;
@@ -171,10 +187,13 @@ void sitemap(void) {
                        default:
                                break;
                }
+
+               struct sitemap_room_list *ptr = roomlist;
+               roomlist = roomlist->next;
+               FreeStrBuf(&ptr->roomname);
+               free(ptr);
        }
 
-       DeleteHashPos(&it);
-       DeleteHash(&roomlist);
        wc_printf("</urlset>\r\n");
        wDumpContent(0);
 }