# 
# patch "ChangeLog"
#  from [a2199643cd484f31b60c8d28af5d0dfe7d31094d]
#    to [02cd30c09d6055d286253494f88bab6c71319332]
# 
# patch "database.cc"
#  from [cae2141a55c09e75754a2887d5c89d258218896a]
#    to [133454d457b3ef266588e5596049fb80aebed4e0]
# 
========================================================================
--- ChangeLog	a2199643cd484f31b60c8d28af5d0dfe7d31094d
+++ ChangeLog	02cd30c09d6055d286253494f88bab6c71319332
@@ -1,5 +1,10 @@
 2005-08-22  Nathaniel Smith  <address@hidden>
 
+	* database.cc: Replace a bunch of F()'s by boost::format's,
+	because F is only for strings displayed to user.
+
+2005-08-22  Nathaniel Smith  <address@hidden>
+
 	* po/Makevars (XGETTEXT_OPTIONS): Extract FP'ed strings.
 
 2005-08-22  Nathaniel Smith  <address@hidden>
========================================================================
--- database.cc	cae2141a55c09e75754a2887d5c89d258218896a
+++ database.cc	133454d457b3ef266588e5596049fb80aebed4e0
@@ -240,7 +240,7 @@
   I(dump != NULL);
   I(vals != NULL);
   I(dump->out != NULL);
-  *(dump->out) << F("INSERT INTO %s VALUES(") % dump->table_name;
+  *(dump->out) << boost::format("INSERT INTO %s VALUES(") % dump->table_name;
   for (int i = 0; i < n; ++i)
     {
       if (i != 0)
@@ -2163,7 +2163,7 @@
           if (i->first == selectors::sel_ident)
             {
               lim += "SELECT id FROM revision_certs ";
-              lim += (F("WHERE id GLOB '%s*'") 
+              lim += (boost::format("WHERE id GLOB '%s*'") 
                       % i->second).str();
             }
           else if (i->first == selectors::sel_cert)
@@ -2181,13 +2181,13 @@
                       spot++;
                       certvalue = i->second.substr(spot);
                       lim += "SELECT id FROM revision_certs ";
-                      lim += (F("WHERE name='%s' AND unbase64(value) glob '%s'")
+                      lim += (boost::format("WHERE name='%s' AND unbase64(value) glob '%s'")
                               % certname % certvalue).str();
                     }
                   else
                     {
                       lim += "SELECT id FROM revision_certs ";
-                      lim += (F("WHERE name='%s'")
+                      lim += (boost::format("WHERE name='%s'")
                               % i->second).str();
                     }
 
@@ -2196,11 +2196,11 @@
           else if (i->first == selectors::sel_unknown)
             {
               lim += "SELECT id FROM revision_certs ";
-              lim += (F(" WHERE (name='%s' OR name='%s' OR name='%s')")
+              lim += (boost::format(" WHERE (name='%s' OR name='%s' OR name='%s')")
                       % author_cert_name 
                       % tag_cert_name 
                       % branch_cert_name).str();
-              lim += (F(" AND unbase64(value) glob '*%s*'")
+              lim += (boost::format(" AND unbase64(value) glob '*%s*'")
                       % i->second).str();     
             }
           else
@@ -2209,17 +2209,17 @@
               string prefix;
               string suffix;
               selector_to_certname(i->first, certname, prefix, suffix);
-              lim += (F("SELECT id FROM revision_certs WHERE name='%s' AND ") % certname).str();
+              lim += (boost::format("SELECT id FROM revision_certs WHERE name='%s' AND ") % certname).str();
               switch (i->first)
                 {
                 case selectors::sel_earlier:
-                  lim += (F("unbase64(value) <= X'%s'") % encode_hexenc(i->second)).str();
+                  lim += (boost::format("unbase64(value) <= X'%s'") % encode_hexenc(i->second)).str();
                   break;
                 case selectors::sel_later:
-                  lim += (F("unbase64(value) > X'%s'") % encode_hexenc(i->second)).str();
+                  lim += (boost::format("unbase64(value) > X'%s'") % encode_hexenc(i->second)).str();
                   break;
                 default:
-                  lim += (F("unbase64(value) glob '%s%s%s'")
+                  lim += (boost::format("unbase64(value) glob '%s%s%s'")
                           % prefix % i->second % suffix).str();
                   break;
                 }
@@ -2235,7 +2235,7 @@
   string query;
   if (ty == selectors::sel_ident)
     {
-      query = (F("SELECT id FROM %s") % lim).str();
+      query = (boost::format("SELECT id FROM %s") % lim).str();
     }
   else 
     {
@@ -2245,7 +2245,7 @@
       if (ty == selectors::sel_unknown)
         {               
           query += 
-            (F(" (name='%s' OR name='%s' OR name='%s')")
+            (boost::format(" (name='%s' OR name='%s' OR name='%s')")
              % author_cert_name 
              % tag_cert_name 
              % branch_cert_name).str();
@@ -2255,12 +2255,12 @@
           string certname;
           selector_to_certname(ty, certname, prefix, suffix);
           query += 
-            (F(" (name='%s')") % certname).str();
+            (boost::format(" (name='%s')") % certname).str();
         }
         
-      query += (F(" AND (unbase64(value) GLOB '%s%s%s')")
+      query += (boost::format(" AND (unbase64(value) GLOB '%s%s%s')")
                 % prefix % partial % suffix).str();
-      query += (F(" AND (id IN %s)") % lim).str();
+      query += (boost::format(" AND (id IN %s)") % lim).str();
     }
 
   // std::cerr << query << std::endl;    // debug expr