Refactored DocListItem to take Document in constructor

[biaweb2.git] / biawebdocumenttree.hpp

diff --git a/biawebdocumenttree.hpp b/biawebdocumenttree.hpp
index 53023f1..0aba119 100644 (file)
--- a/biawebdocumenttree.hpp
+++ b/biawebdocumenttree.hpp
@@ -248,11 +248,8 @@ namespace biaweb {
             // If the items don't exceed max size of RSS feed
             if (feed.get()->get_num_items() <= MAX_RSS_FEED)
                 feed.get()->add_rss_item (fitem);                        
-            // Add the document to the document list
-            DocListItem item (doc.get_title(),
-                            urlpath + doc.get_filename() + ".html", 
-                            doc.get_creation_date(), doc.get_modified_date (), 
-                            doc.get_meta_desc());
+            // Add the document details to the document list
+            DocListItem item (&doc, urlpath);
             article_list.get()->add_document_item (item);
             // output the document also, add the navigation bit and side bars
 
@@ -275,14 +272,17 @@ namespace biaweb {
             std::unique_ptr<SideBar> bar3 (new SideBar ());
             bar3.get()->set_title (tpl->get_stringbit (SUBSCRIBE));
             bar3.get()->add_sidebar_item (
-                    GenericLinkItem (tpl->get_stringbit(RSS_FEED), urlpath + "/feed.xml"));
+                    GenericLinkItem (tpl->get_stringbit(RSS_FEED), urlpath + "feed.xml"));
             index.get()->add_side_bar (*bar3.get());
         }
 
         // add the navigation bit
         index.get()->set_navigation_bit (*navbit.get());
-        // index should contain the summary followed by the article list
-        index.get()->set_content (this->summary + article_list.get()->to_html(tpl));
+        // index should contain the summary followed by the the article list
+        // and the sub categories
+        index.get()->set_content (this->summary +
+                                article_list.get()->to_html(tpl) +
+                                bar2.get()->to_html (tpl));
 
         // output the index file
         index.get()->output_to_html (tpl, filepath);