Differences From:

File src/info.c part of check-in [d6ad7aa034] - Make sure HTML tags in wiki are terminated in the diff screen too. by drh on 2007-11-22 22:14:38. [view]

To:

File src/info.c part of check-in [285929373757b] - Add the %w and %W formatting options for internal printf usage. Use these formatting characters to render wiki. Fix additional problems of unterminated wiki on webpage rendering by using %w. (There are probably more problems yet to be discovered and fixed.) by drh on 2007-11-22 22:55:05. [view]

@@ -140,9 +140,9 @@
       @ <ul>
     }
     @ <li>
     hyperlink_to_uuid(zUuid);
-    @ %s(zCom) (by %s(zUser) on %s(zDate))
+    @ %w(zCom) (by %s(zUser) on %s(zDate))
     if( depth ){
       n = showDescendents(cid, depth-1, 0);
     }else{
       n = db_int(0, "SELECT 1 FROM plink WHERE pid=%d", cid);
@@ -191,9 +191,9 @@
       @ <ul>
     }
     @ <li>
     hyperlink_to_uuid(zUuid);
-    @ %s(zCom) (by %s(zUser) on %s(zDate))
+    @ %w(zCom) (by %s(zUser) on %s(zDate))
     if( depth ){
       showAncestors(cid, depth-1, 0);
     }
   }
@@ -230,9 +230,9 @@
       @ <ul>
     }
     @ <li>
     hyperlink_to_uuid(zUuid);
-    @ %s(zCom) (by %s(zUser) on %s(zDate))
+    @ %w(zCom) (by %s(zUser) on %s(zDate))
   }
   db_finalize(&q);
   if( cnt ){
     @ </ul>
@@ -317,9 +317,8 @@
      "   AND event.objid=%d",
      rid, rid
   );
   if( db_step(&q)==SQLITE_ROW ){
-    Blob comment;
     const char *zUuid = db_column_text(&q, 0);
     char *zTitle = mprintf("Version: [%.10s]", zUuid);
     style_header(zTitle);
     free(zTitle);
@@ -330,12 +329,10 @@
     @ <tr><th>Date:</th><td>%s(db_column_text(&q, 1))</td></tr>
     if( g.okSetup ){
       @ <tr><th>Record ID:</th><td>%d(rid)</td></tr>
     }
-    @ <tr><th>Original&nbsp;User:</th><td>%s(db_column_text(&q, 2))</td></tr>
-    @ <tr><th>Original&nbsp;Comment:</th><td>
-    db_ephemeral_blob(&q, 3, &comment);
-    wiki_convert(&comment, 0, 0);
+    @ <tr><th>Original&nbsp;User:</th><td>%h(db_column_text(&q, 2))</td></tr>
+    @ <tr><th>Original&nbsp;Comment:</th><td>%w(db_column_text(&q,3))</td></tr>
     @ </td></tr>
     @ <tr><th>Commands:</th>
     @   <td>
     @     <a href="%s(g.zBaseURL)/vdiff/%d(rid)">diff</a>
@@ -603,19 +600,15 @@
   while( db_step(&q)==SQLITE_ROW ){
     const char *zName = db_column_text(&q, 0);
     const char *zDate = db_column_text(&q, 1);
     const char *zFuuid = db_column_text(&q, 2);
+    const char *zCom = db_column_text(&q, 3);
     const char *zUser = db_column_text(&q, 4);
     const char *zVers = db_column_text(&q, 5);
-    Blob comment;
     @ File <a href="%s(g.zBaseURL)/finfo?name=%T(zName)">%h(zName)</a>
     @ uuid %s(zFuuid) part of check-in
     hyperlink_to_uuid(zVers);
-    blob_zero(&comment);
-    db_column_blob(&q, 3, &comment);
-    blob_appendf(&comment, " by %h(zUser) on %s(zDate)");
-    wiki_convert(&comment, 0, 0);
-    blob_reset(&comment);
+    @ %w(zCom) by %h(zUser) on %s(zDate)
     cnt++;
   }
   db_finalize(&q);
   db_prepare(&q,
@@ -652,16 +645,12 @@
     while( db_step(&q)==SQLITE_ROW ){
       const char *zDate = db_column_text(&q, 0);
       const char *zUuid = db_column_text(&q, 3);
       const char *zUser = db_column_text(&q, 1);
-      Blob comment;
+      const char *zCom = db_column_text(&q, 2);
       @ Manifest of version
       hyperlink_to_uuid(zUuid);
-      blob_zero(&comment);
-      db_column_blob(&q, 2, &comment);
-      blob_appendf(&comment, " by %h(zUser) on %s(zDate)");
-      wiki_convert(&comment, 0, 0);
-      blob_reset(&comment);
+      @ %w(zCom) by %h(zUser) on %s(zDate)
       cnt++;
     }
     db_finalize(&q);
   }