Fossil SCM

Follow-up to [f39c33c133]: Only add extra table cell when rcvid column is shown

andygoth 2017-10-03 05:12 trunk
Commit 1f9718a694b86dd51292e6ec4b3f4d37633b91dee196f781c62f4b496ef985dd
Parent 5eba557c22ff8e6…
1 file changed +69 -65
~ src/unversioned.c
M src/unversioned.c
+69 -65
--- src/unversioned.c
+++ src/unversioned.c
@@ -495,75 +495,79 @@
495495
 " WHERE user.uid=rcvfrom.uid AND rcvfrom.rcvid=unversioned.rcvid),"
496496
 " rcvid"
497497
 " FROM unversioned %s ORDER BY %s",
498498
 showDel ? "" : "WHERE hash IS NOT NULL" /*safe-for-%s*/,
499499
 zOrderBy/*safe-for-%s*/
500
- );
501
- iNow = db_int64(0, "SELECT strftime('%%s','now');");
502
- while( db_step(&q)==SQLITE_ROW ){
503
- const char *zName = db_column_text(&q, 0);
504
- sqlite3_int64 mtime = db_column_int(&q, 1);
505
- const char *zHash = db_column_text(&q, 2);
506
- int isDeleted = zHash==0;
507
- int fullSize = db_column_int(&q, 3);
508
- char *zAge = human_readable_age((iNow - mtime)/86400.0);
509
- const char *zLogin = db_column_text(&q, 4);
510
- int rcvid = db_column_int(&q,5);
511
- if( zLogin==0 ) zLogin = "";
512
- if( (n++)==0 ){
513
- @ <div class="uvlist">
514
- @ <table cellpadding="2" cellspacing="0" border="1" id="uvtab">
515
- @ <thead><tr>
516
- @ <th> Name
517
- @ <th> Age
518
- @ <th> Size
519
- @ <th> User
520
- @ <th> SHA1
521
- if( g.perm.Admin ){
522
- @ <th> rcvid
523
- }
524
- @ </tr></thead>
525
- @ <tbody>
526
- }
527
- @ <tr>
528
- if( isDeleted ){
529
- sqlite3_snprintf(sizeof(zSzName), zSzName, "<i>Deleted</i>");
530
- zHash = "";
531
- fullSize = 0;
532
- @ <td> %h(zName) </td>
533
- }else{
534
- approxSizeName(sizeof(zSzName), zSzName, fullSize);
535
- iTotalSz += fullSize;
536
- cnt++;
537
- @ <td> <a href='%R/uv/%T(zName)'>%h(zName)</a> </td>
538
- }
539
- @ <td data-sortkey='%016llx(-mtime)'> %s(zAge) </td>
540
- @ <td data-sortkey='%08x(fullSize)'> %s(zSzName) </td>
541
- @ <td> %h(zLogin) </td>
542
- @ <td> %h(zHash) </td>
543
- if( g.perm.Admin ){
544
- if( rcvid ){
545
- @ <td> <a href="%R/rcvfrom?rcvid=%d(rcvid)">%d(rcvid)</a>
546
- }else{
547
- @ <td>
548
- }
549
- }
550
- @ </tr>
551
- fossil_free(zAge);
552
- }
553
- db_finalize(&q);
554
- if( n ){
555
- approxSizeName(sizeof(zSzName), zSzName, iTotalSz);
556
- @ </tbody>
557
- @ <tfoot><tr><td><b>Total over %d(cnt) files</b><td><td>%s(zSzName)
558
- @ <td><td><td></tfoot>
559
- @ </table></div>
560
- output_table_sorting_javascript("uvtab","tkKttN",1);
561
- }else{
562
- @ No unversioned files on this server.
563
- }
564
- style_footer();
500
+ );
501
+ iNow = db_int64(0, "SELECT strftime('%%s','now');");
502
+ while( db_step(&q)==SQLITE_ROW ){
503
+ const char *zName = db_column_text(&q, 0);
504
+ sqlite3_int64 mtime = db_column_int(&q, 1);
505
+ const char *zHash = db_column_text(&q, 2);
506
+ int isDeleted = zHash==0;
507
+ int fullSize = db_column_int(&q, 3);
508
+ char *zAge = human_readable_age((iNow - mtime)/86400.0);
509
+ const char *zLogin = db_column_text(&q, 4);
510
+ int rcvid = db_column_int(&q,5);
511
+ if( zLogin==0 ) zLogin = "";
512
+ if( (n++)==0 ){
513
+ @ <div class="uvlist">
514
+ @ <table cellpadding="2" cellspacing="0" border="1" id="uvtab">
515
+ @ <thead><tr>
516
+ @ <th> Name
517
+ @ <th> Age
518
+ @ <th> Size
519
+ @ <th> User
520
+ @ <th> SHA1
521
+ if( g.perm.Admin ){
522
+ @ <th> rcvid
523
+ }
524
+ @ </tr></thead>
525
+ @ <tbody>
526
+ }
527
+ @ <tr>
528
+ if( isDeleted ){
529
+ sqlite3_snprintf(sizeof(zSzName), zSzName, "<i>Deleted</i>");
530
+ zHash = "";
531
+ fullSize = 0;
532
+ @ <td> %h(zName) </td>
533
+ }else{
534
+ approxSizeName(sizeof(zSzName), zSzName, fullSize);
535
+ iTotalSz += fullSize;
536
+ cnt++;
537
+ @ <td> <a href='%R/uv/%T(zName)'>%h(zName)</a> </td>
538
+ }
539
+ @ <td data-sortkey='%016llx(-mtime)'> %s(zAge) </td>
540
+ @ <td data-sortkey='%08x(fullSize)'> %s(zSzName) </td>
541
+ @ <td> %h(zLogin) </td>
542
+ @ <td> %h(zHash) </td>
543
+ if( g.perm.Admin ){
544
+ if( rcvid ){
545
+ @ <td> <a href="%R/rcvfrom?rcvid=%d(rcvid)">%d(rcvid)</a>
546
+ }else{
547
+ @ <td>
548
+ }
549
+ }
550
+ @ </tr>
551
+ fossil_free(zAge);
552
+ }
553
+ db_finalize(&q);
554
+ if( n ){
555
+ approxSizeName(sizeof(zSzName), zSzName, iTotalSz);
556
+ @ </tbody>
557
+ @ <tfoot><tr><td><b>Total over %d(cnt) files</b><td><td>%s(zSzName)
558
+ @ <td><td>
559
+ if( g.perm.Admin ){
560
+ @ <td>
561
+ }
562
+ @ </tfoot>
563
+ @ </table></div>
564
+ output_table_sorting_javascript("uvtab","tkKttN",1);
565
+ }else{
566
+ @ No unversioned files on this server.
567
+ }
568
+ style_footer();
565569
 }
566570
567571
 /*
568572
 ** WEBPAGE: juvlist
569573
 **
570574
--- src/unversioned.c
+++ src/unversioned.c
@@ -495,75 +495,79 @@
495 " WHERE user.uid=rcvfrom.uid AND rcvfrom.rcvid=unversioned.rcvid),"
496 " rcvid"
497 " FROM unversioned %s ORDER BY %s",
498 showDel ? "" : "WHERE hash IS NOT NULL" /*safe-for-%s*/,
499 zOrderBy/*safe-for-%s*/
500 );
501 iNow = db_int64(0, "SELECT strftime('%%s','now');");
502 while( db_step(&q)==SQLITE_ROW ){
503 const char *zName = db_column_text(&q, 0);
504 sqlite3_int64 mtime = db_column_int(&q, 1);
505 const char *zHash = db_column_text(&q, 2);
506 int isDeleted = zHash==0;
507 int fullSize = db_column_int(&q, 3);
508 char *zAge = human_readable_age((iNow - mtime)/86400.0);
509 const char *zLogin = db_column_text(&q, 4);
510 int rcvid = db_column_int(&q,5);
511 if( zLogin==0 ) zLogin = "";
512 if( (n++)==0 ){
513 @ <div class="uvlist">
514 @ <table cellpadding="2" cellspacing="0" border="1" id="uvtab">
515 @ <thead><tr>
516 @ <th> Name
517 @ <th> Age
518 @ <th> Size
519 @ <th> User
520 @ <th> SHA1
521 if( g.perm.Admin ){
522 @ <th> rcvid
523 }
524 @ </tr></thead>
525 @ <tbody>
526 }
527 @ <tr>
528 if( isDeleted ){
529 sqlite3_snprintf(sizeof(zSzName), zSzName, "<i>Deleted</i>");
530 zHash = "";
531 fullSize = 0;
532 @ <td> %h(zName) </td>
533 }else{
534 approxSizeName(sizeof(zSzName), zSzName, fullSize);
535 iTotalSz += fullSize;
536 cnt++;
537 @ <td> <a href='%R/uv/%T(zName)'>%h(zName)</a> </td>
538 }
539 @ <td data-sortkey='%016llx(-mtime)'> %s(zAge) </td>
540 @ <td data-sortkey='%08x(fullSize)'> %s(zSzName) </td>
541 @ <td> %h(zLogin) </td>
542 @ <td> %h(zHash) </td>
543 if( g.perm.Admin ){
544 if( rcvid ){
545 @ <td> <a href="%R/rcvfrom?rcvid=%d(rcvid)">%d(rcvid)</a>
546 }else{
547 @ <td>
548 }
549 }
550 @ </tr>
551 fossil_free(zAge);
552 }
553 db_finalize(&q);
554 if( n ){
555 approxSizeName(sizeof(zSzName), zSzName, iTotalSz);
556 @ </tbody>
557 @ <tfoot><tr><td><b>Total over %d(cnt) files</b><td><td>%s(zSzName)
558 @ <td><td><td></tfoot>
559 @ </table></div>
560 output_table_sorting_javascript("uvtab","tkKttN",1);
561 }else{
562 @ No unversioned files on this server.
563 }
564 style_footer();
 
 
 
 
565 }
566
567 /*
568 ** WEBPAGE: juvlist
569 **
570
--- src/unversioned.c
+++ src/unversioned.c
@@ -495,75 +495,79 @@
495 " WHERE user.uid=rcvfrom.uid AND rcvfrom.rcvid=unversioned.rcvid),"
496 " rcvid"
497 " FROM unversioned %s ORDER BY %s",
498 showDel ? "" : "WHERE hash IS NOT NULL" /*safe-for-%s*/,
499 zOrderBy/*safe-for-%s*/
500 );
501 iNow = db_int64(0, "SELECT strftime('%%s','now');");
502 while( db_step(&q)==SQLITE_ROW ){
503 const char *zName = db_column_text(&q, 0);
504 sqlite3_int64 mtime = db_column_int(&q, 1);
505 const char *zHash = db_column_text(&q, 2);
506 int isDeleted = zHash==0;
507 int fullSize = db_column_int(&q, 3);
508 char *zAge = human_readable_age((iNow - mtime)/86400.0);
509 const char *zLogin = db_column_text(&q, 4);
510 int rcvid = db_column_int(&q,5);
511 if( zLogin==0 ) zLogin = "";
512 if( (n++)==0 ){
513 @ <div class="uvlist">
514 @ <table cellpadding="2" cellspacing="0" border="1" id="uvtab">
515 @ <thead><tr>
516 @ <th> Name
517 @ <th> Age
518 @ <th> Size
519 @ <th> User
520 @ <th> SHA1
521 if( g.perm.Admin ){
522 @ <th> rcvid
523 }
524 @ </tr></thead>
525 @ <tbody>
526 }
527 @ <tr>
528 if( isDeleted ){
529 sqlite3_snprintf(sizeof(zSzName), zSzName, "<i>Deleted</i>");
530 zHash = "";
531 fullSize = 0;
532 @ <td> %h(zName) </td>
533 }else{
534 approxSizeName(sizeof(zSzName), zSzName, fullSize);
535 iTotalSz += fullSize;
536 cnt++;
537 @ <td> <a href='%R/uv/%T(zName)'>%h(zName)</a> </td>
538 }
539 @ <td data-sortkey='%016llx(-mtime)'> %s(zAge) </td>
540 @ <td data-sortkey='%08x(fullSize)'> %s(zSzName) </td>
541 @ <td> %h(zLogin) </td>
542 @ <td> %h(zHash) </td>
543 if( g.perm.Admin ){
544 if( rcvid ){
545 @ <td> <a href="%R/rcvfrom?rcvid=%d(rcvid)">%d(rcvid)</a>
546 }else{
547 @ <td>
548 }
549 }
550 @ </tr>
551 fossil_free(zAge);
552 }
553 db_finalize(&q);
554 if( n ){
555 approxSizeName(sizeof(zSzName), zSzName, iTotalSz);
556 @ </tbody>
557 @ <tfoot><tr><td><b>Total over %d(cnt) files</b><td><td>%s(zSzName)
558 @ <td><td>
559 if( g.perm.Admin ){
560 @ <td>
561 }
562 @ </tfoot>
563 @ </table></div>
564 output_table_sorting_javascript("uvtab","tkKttN",1);
565 }else{
566 @ No unversioned files on this server.
567 }
568 style_footer();
569 }
570
571 /*
572 ** WEBPAGE: juvlist
573 **
574

Keyboard Shortcuts

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