1 files changed, 65 insertions, 34 deletions

diff --git a/mod/page.cxx b/mod/page.cxx
index 7352867..bc2e42d 100644
--- a/mod/page.cxx
+++ b/mod/page.cxx
@@ -137,9 +137,17 @@ namespace brep
   void DIV_COUNTER::
   operator() (serializer& s) const
   {
-    s << DIV(ID="count")
-      <<   count_ << " "
-      <<   (count_ % 10 == 1 && count_ % 100 != 11 ? singular_ : plural_)
+    s << DIV(ID="count");
+
+    if (count_)
+      s << *count_;
+    else
+      s << '?';
+
+    s <<   ' '
+      <<   (count_ && *count_ % 10 == 1 && *count_ % 100 != 11
+            ? singular_
+            : plural_)
       << ~DIV;
   }
 
@@ -237,15 +245,9 @@ namespace brep
       <<       A
       <<       HREF
       <<         tenant_dir (root_, tenant_) /
-                 path (mime_url_encode (name_.string (), false));
-
-    // Propagate search criteria to the package details page.
-    //
-    if (!query_.empty ())
-      s << "?q=" << query_;
-
-    s <<       ~HREF
-      <<          name_
+                 path (mime_url_encode (name_.string (), false))
+      <<       ~HREF
+      <<         name_
       <<       ~A
       <<     ~SPAN
       <<   ~TD
@@ -747,8 +749,24 @@ namespace brep
       <<   TD
       <<     SPAN(CLASS="value");
 
+    // Print the ' | ' separator if this is not the first item and reset the
+    // `first` flag to false otherwise.
+    //
+    bool first (true);
+    auto separate = [&s, &first] ()
+    {
+      if (first)
+        first = false;
+      else
+        s << " | ";
+    };
+
     if (build_.state == build_state::building)
-      s << SPAN(CLASS="building") << "building" << ~SPAN << " | ";
+    {
+      separate ();
+
+      s << SPAN(CLASS="building") << "building" << ~SPAN;
+    }
     else
     {
       // If no unsuccessful operation results available, then print the
@@ -761,7 +779,10 @@ namespace brep
       if (build_.results.empty () || *build_.status == result_status::success)
       {
         assert (build_.status);
-        s << SPAN_BUILD_RESULT_STATUS (*build_.status) << " | ";
+
+        separate ();
+
+        s << SPAN_BUILD_RESULT_STATUS (*build_.status);
       }
 
       if (!build_.results.empty ())
@@ -769,6 +790,9 @@ namespace brep
         for (const auto& r: build_.results)
         {
           if (r.status != result_status::success)
+          {
+            separate ();
+
             s << SPAN_BUILD_RESULT_STATUS (r.status) << " ("
               << A
               <<   HREF
@@ -776,28 +800,33 @@ namespace brep
               <<   ~HREF
               <<   r.operation
               << ~A
-              << ") | ";
+              << ")";
+          }
         }
 
+        separate ();
+
         s << A
           <<   HREF << build_log_url (host_, root_, build_) << ~HREF
           <<   "log"
-          << ~A
-          << " | ";
+          << ~A;
       }
     }
 
-    if (archived_)
-      s << SPAN(CLASS="archived") << "archived" << ~SPAN;
-    else if (build_.force == (build_.state == build_state::building
-                              ? force_state::forcing
-                              : force_state::forced))
-      s << SPAN(CLASS="pending") << "pending" << ~SPAN;
-    else
-      s << A
-        <<   HREF << build_force_url (host_, root_, build_) << ~HREF
-        <<   "rebuild"
-        << ~A;
+    if (!archived_)
+    {
+      separate ();
+
+      if (build_.force == (build_.state == build_state::building
+                           ? force_state::forcing
+                           : force_state::forced))
+        s << SPAN(CLASS="pending") << "pending" << ~SPAN;
+      else
+        s << A
+          <<   HREF << build_force_url (host_, root_, build_) << ~HREF
+          <<   "rebuild"
+          << ~A;
+    }
 
     s <<     ~SPAN
       <<   ~TD
@@ -925,14 +954,16 @@ namespace brep
   void DIV_TEXT::
   operator() (serializer& s) const
   {
-    switch (type_)
+    const string& t (text_.text);
+
+    switch (text_.type)
     {
     case text_type::plain:
       {
         // To keep things regular we wrap the preformatted text into <div>.
         //
         s << DIV(ID=id_, CLASS="plain");
-        serialize_pre_text (s, text_, length_, url_, "" /* id */);
+        serialize_pre_text (s, t, length_, url_, "" /* id */);
         s << ~DIV;
         break;
       }
@@ -952,9 +983,9 @@ namespace brep
         // calls to fail is the inability to allocate memory. Unfortunately,
         // instead of reporting the failure to the caller, the API issues
         // diagnostics to stderr and aborts the process. Let's decrease the
-        // probability of such an event by limiting the text size to 64K.
+        // probability of such an event by limiting the text size to 1M.
         //
-        if (text_.size () > 64 * 1024)
+        if (t.size () > 1024 * 1024)
         {
           print_error (what_ + " is too long");
           return;
@@ -978,7 +1009,7 @@ namespace brep
 
             // Enable GitHub extensions in the parser, if requested.
             //
-            if (type_ == text_type::github_mark)
+            if (text_.type == text_type::github_mark)
             {
               auto add = [&parser] (const char* ext)
               {
@@ -997,7 +1028,7 @@ namespace brep
               add ("autolink");
             }
 
-            cmark_parser_feed (parser.get (), text_.c_str (), text_.size ());
+            cmark_parser_feed (parser.get (), t.c_str (), t.size ());
 
             unique_ptr<cmark_node, void (*)(cmark_node*)> doc (
               cmark_parser_finish (parser.get ()),