Fossil SCM

Remove nReply which is present only in debug outputs, correct column alignment in debug output

andygoth 2020-08-21 21:17 andygoth-forum-refactor
Commit b932e49c7ffef84242e3fcb774e573d1897649a9cc7cac9f07c62f7dce0b86e9
Parent bf98aa0069e7ca9…
1 file changed +4 -7
~ src/forum.c
M src/forum.c
+4 -7
--- src/forum.c
+++ src/forum.c
@@ -35,11 +35,10 @@
3535
 struct ForumEntry {
3636
 int fpid; /* rid for this entry */
3737
 int fprev; /* zero if initial entry. non-zero if an edit */
3838
 int firt; /* This entry replies to firt */
3939
 int mfirt; /* Root in-reply-to */
40
- int nReply; /* Number of replies to this entry */
4140
 int sid; /* Serial ID number */
4241
 char *zUuid; /* Artifact hash */
4342
 ForumEntry *pEditHead; /* Original, unedited entry */
4443
 ForumEntry *pEditTail; /* Most recent edit for this entry */
4544
 ForumEntry *pEditNext; /* This entry is edited by pEditNext */
@@ -138,11 +137,10 @@
138137
 if( pPrev ){
139138
 pPrev->nIndent = pBase->nIndent + 1;
140139
 forumentry_add_to_display(pThread, pPrev);
141140
 forumthread_display_order(pThread, pPrev);
142141
 }
143
- pBase->nReply++;
144142
 pPrev = p;
145143
 }
146144
 }
147145
 if( pPrev ){
148146
 pPrev->nIndent = pBase->nIndent + 1;
@@ -297,15 +295,15 @@
297295
 pThread = forumthread_create(froot, 1);
298296
 fossil_print("Chronological:\n");
299297
 fossil_print(
300298
 /* 0 1 2 3 4 5 6 7 */
301299
 /* 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123 */
302
- " sid fpid firt fprev mfirt pEditTail nReply hash\n");
300
+ " sid fpid firt fprev mfirt pEditTail hash\n");
303301
 for(p=pThread->pFirst; p; p=p->pNext){
304
- fossil_print("%4d %9d %9d %9d %11d %9d %6d %8.8s\n", p->sid,
302
+ fossil_print("%4d %9d %9d %9d %9d %9d %8.8s\n", p->sid,
305303
 p->fpid, p->firt, p->fprev, p->mfirt,
306
- p->pEditTail ? p->pEditTail->fpid : 0, p->nReply, p->zUuid);
304
+ p->pEditTail ? p->pEditTail->fpid : 0, p->zUuid);
307305
 }
308306
 fossil_print("\nDisplay\n");
309307
 for(p=pThread->pDisplay; p; p=p->pDisplay){
310308
 fossil_print("%*s", (p->nIndent-1)*3, "");
311309
 if( p->pEditTail ){
@@ -522,19 +520,18 @@
522520
 */
523521
 if( PB("threadtable") ){
524522
 @ <hr>
525523
 @ <table border="1" cellpadding="3" cellspacing="0">
526524
 @ <tr><th>sid<th>fpid<th>firt<th>fprev<th>mfirt<th>pEditHead<th>pEditTail\
527
- @ <th>pEditNext<th>pEditPrev<th>nReply<th>hash
525
+ @ <th>pEditNext<th>pEditPrev<th>hash
528526
 for(p=pThread->pFirst; p; p=p->pNext){
529527
 @ <tr><td>%d(p->sid)<td>%d(p->fpid)<td>%d(p->firt)\
530528
 @ <td>%d(p->fprev)<td>%d(p->mfirt)\
531529
 @ <td>%d(p->pEditHead?p->pEditHead->fpid:0)\
532530
 @ <td>%d(p->pEditTail?p->pEditTail->fpid:0)\
533531
 @ <td>%d(p->pEditNext?p->pEditNext->fpid:0)\
534532
 @ <td>%d(p->pEditPrev?p->pEditPrev->fpid:0)\
535
- @ <td>%d(p->nReply)\
536533
 @ <td>%S(p->zUuid)</tr>
537534
 }
538535
 @ </table>
539536
 }
540537
541538
--- src/forum.c
+++ src/forum.c
@@ -35,11 +35,10 @@
35 struct ForumEntry {
36 int fpid; /* rid for this entry */
37 int fprev; /* zero if initial entry. non-zero if an edit */
38 int firt; /* This entry replies to firt */
39 int mfirt; /* Root in-reply-to */
40 int nReply; /* Number of replies to this entry */
41 int sid; /* Serial ID number */
42 char *zUuid; /* Artifact hash */
43 ForumEntry *pEditHead; /* Original, unedited entry */
44 ForumEntry *pEditTail; /* Most recent edit for this entry */
45 ForumEntry *pEditNext; /* This entry is edited by pEditNext */
@@ -138,11 +137,10 @@
138 if( pPrev ){
139 pPrev->nIndent = pBase->nIndent + 1;
140 forumentry_add_to_display(pThread, pPrev);
141 forumthread_display_order(pThread, pPrev);
142 }
143 pBase->nReply++;
144 pPrev = p;
145 }
146 }
147 if( pPrev ){
148 pPrev->nIndent = pBase->nIndent + 1;
@@ -297,15 +295,15 @@
297 pThread = forumthread_create(froot, 1);
298 fossil_print("Chronological:\n");
299 fossil_print(
300 /* 0 1 2 3 4 5 6 7 */
301 /* 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123 */
302 " sid fpid firt fprev mfirt pEditTail nReply hash\n");
303 for(p=pThread->pFirst; p; p=p->pNext){
304 fossil_print("%4d %9d %9d %9d %11d %9d %6d %8.8s\n", p->sid,
305 p->fpid, p->firt, p->fprev, p->mfirt,
306 p->pEditTail ? p->pEditTail->fpid : 0, p->nReply, p->zUuid);
307 }
308 fossil_print("\nDisplay\n");
309 for(p=pThread->pDisplay; p; p=p->pDisplay){
310 fossil_print("%*s", (p->nIndent-1)*3, "");
311 if( p->pEditTail ){
@@ -522,19 +520,18 @@
522 */
523 if( PB("threadtable") ){
524 @ <hr>
525 @ <table border="1" cellpadding="3" cellspacing="0">
526 @ <tr><th>sid<th>fpid<th>firt<th>fprev<th>mfirt<th>pEditHead<th>pEditTail\
527 @ <th>pEditNext<th>pEditPrev<th>nReply<th>hash
528 for(p=pThread->pFirst; p; p=p->pNext){
529 @ <tr><td>%d(p->sid)<td>%d(p->fpid)<td>%d(p->firt)\
530 @ <td>%d(p->fprev)<td>%d(p->mfirt)\
531 @ <td>%d(p->pEditHead?p->pEditHead->fpid:0)\
532 @ <td>%d(p->pEditTail?p->pEditTail->fpid:0)\
533 @ <td>%d(p->pEditNext?p->pEditNext->fpid:0)\
534 @ <td>%d(p->pEditPrev?p->pEditPrev->fpid:0)\
535 @ <td>%d(p->nReply)\
536 @ <td>%S(p->zUuid)</tr>
537 }
538 @ </table>
539 }
540
541
--- src/forum.c
+++ src/forum.c
@@ -35,11 +35,10 @@
35 struct ForumEntry {
36 int fpid; /* rid for this entry */
37 int fprev; /* zero if initial entry. non-zero if an edit */
38 int firt; /* This entry replies to firt */
39 int mfirt; /* Root in-reply-to */
 
40 int sid; /* Serial ID number */
41 char *zUuid; /* Artifact hash */
42 ForumEntry *pEditHead; /* Original, unedited entry */
43 ForumEntry *pEditTail; /* Most recent edit for this entry */
44 ForumEntry *pEditNext; /* This entry is edited by pEditNext */
@@ -138,11 +137,10 @@
137 if( pPrev ){
138 pPrev->nIndent = pBase->nIndent + 1;
139 forumentry_add_to_display(pThread, pPrev);
140 forumthread_display_order(pThread, pPrev);
141 }
 
142 pPrev = p;
143 }
144 }
145 if( pPrev ){
146 pPrev->nIndent = pBase->nIndent + 1;
@@ -297,15 +295,15 @@
295 pThread = forumthread_create(froot, 1);
296 fossil_print("Chronological:\n");
297 fossil_print(
298 /* 0 1 2 3 4 5 6 7 */
299 /* 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123 */
300 " sid fpid firt fprev mfirt pEditTail hash\n");
301 for(p=pThread->pFirst; p; p=p->pNext){
302 fossil_print("%4d %9d %9d %9d %9d %9d %8.8s\n", p->sid,
303 p->fpid, p->firt, p->fprev, p->mfirt,
304 p->pEditTail ? p->pEditTail->fpid : 0, p->zUuid);
305 }
306 fossil_print("\nDisplay\n");
307 for(p=pThread->pDisplay; p; p=p->pDisplay){
308 fossil_print("%*s", (p->nIndent-1)*3, "");
309 if( p->pEditTail ){
@@ -522,19 +520,18 @@
520 */
521 if( PB("threadtable") ){
522 @ <hr>
523 @ <table border="1" cellpadding="3" cellspacing="0">
524 @ <tr><th>sid<th>fpid<th>firt<th>fprev<th>mfirt<th>pEditHead<th>pEditTail\
525 @ <th>pEditNext<th>pEditPrev<th>hash
526 for(p=pThread->pFirst; p; p=p->pNext){
527 @ <tr><td>%d(p->sid)<td>%d(p->fpid)<td>%d(p->firt)\
528 @ <td>%d(p->fprev)<td>%d(p->mfirt)\
529 @ <td>%d(p->pEditHead?p->pEditHead->fpid:0)\
530 @ <td>%d(p->pEditTail?p->pEditTail->fpid:0)\
531 @ <td>%d(p->pEditNext?p->pEditNext->fpid:0)\
532 @ <td>%d(p->pEditPrev?p->pEditPrev->fpid:0)\
 
533 @ <td>%S(p->zUuid)</tr>
534 }
535 @ </table>
536 }
537
538

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button