Fossil SCM

Use the describe_artifacts utility on the administrative "received-from" log web pages.

drh 2014-12-01 20:53 UTC DBP-workflow
Commit 4bd49a210881483fde0687dede8b77c12a464964
Parent 87a04576f2de9c1…
1 file changed +15 -4
~ src/shun.c
M src/shun.c
+15 -4
--- src/shun.c
+++ src/shun.c
@@ -370,17 +370,19 @@
370370
 style_header("Content Source %d", rcvid);
371371
 if( db_exists(
372372
 "SELECT 1 FROM blob WHERE rcvid=%d AND"
373373
 " NOT EXISTS (SELECT 1 FROM shun WHERE shun.uuid=blob.uuid)", rcvid)
374374
 ){
375
- style_submenu_element("Shun All", "Shun All", "shun?shun&rcvid=%d#addshun", rcvid);
375
+ style_submenu_element("Shun All", "Shun All",
376
+ "shun?shun&rcvid=%d#addshun", rcvid);
376377
 }
377378
 if( db_exists(
378379
 "SELECT 1 FROM blob WHERE rcvid=%d AND"
379380
 " EXISTS (SELECT 1 FROM shun WHERE shun.uuid=blob.uuid)", rcvid)
380381
 ){
381
- style_submenu_element("Unshun All", "Unshun All", "shun?accept&rcvid=%d#delshun", rcvid);
382
+ style_submenu_element("Unshun All", "Unshun All",
383
+ "shun?accept&rcvid=%d#delshun", rcvid);
382384
 }
383385
 db_prepare(&q,
384386
 "SELECT login, datetime(rcvfrom.mtime), rcvfrom.ipaddr"
385387
 " FROM rcvfrom LEFT JOIN user USING(uid)"
386388
 " WHERE rcvid=%d",
@@ -399,22 +401,31 @@
399401
 @ <td valign="top">%s(zDate)</td></tr>
400402
 @ <tr><th valign="top" align="right">IP&nbsp;Address:</th>
401403
 @ <td valign="top">%s(zIpAddr)</td></tr>
402404
 }
403405
 db_finalize(&q);
406
+ db_multi_exec(
407
+ "CREATE TEMP TABLE toshow(rid INTEGER PRIMARY KEY);"
408
+ "INSERT INTO toshow SELECT rid FROM blob WHERE rcvid=%d", rcvid
409
+ );
410
+ describe_artifacts("IN toshow");
404411
 db_prepare(&q,
405
- "SELECT rid, uuid, size FROM blob WHERE rcvid=%d", rcvid
412
+ "SELECT blob.rid, blob.uuid, blob.size, description.summary\n"
413
+ " FROM blob LEFT JOIN description ON (blob.rid=description.rid)"
414
+ " WHERE blob.rcvid=%d", rcvid
406415
 );
407416
 @ <tr><th valign="top" align="right">Artifacts:</th>
408417
 @ <td valign="top">
409418
 while( db_step(&q)==SQLITE_ROW ){
410419
 int rid = db_column_int(&q, 0);
411420
 const char *zUuid = db_column_text(&q, 1);
412421
 int size = db_column_int(&q, 2);
422
+ const char *zDesc = db_column_text(&q, 3);
423
+ if( zDesc==0 ) zDesc = "";
413424
 @ <a href="%s(g.zTop)/info/%s(zUuid)">%s(zUuid)</a>
414
- @ (rid: %d(rid), size: %d(size))<br />
425
+ @ %h(zDesc) (size: %d(size))<br />
415426
 }
416427
 @ </td></tr>
417428
 @ </table>
418429
 db_finalize(&q);
419430
 style_footer();
420431
 }
421432
--- src/shun.c
+++ src/shun.c
@@ -370,17 +370,19 @@
370 style_header("Content Source %d", rcvid);
371 if( db_exists(
372 "SELECT 1 FROM blob WHERE rcvid=%d AND"
373 " NOT EXISTS (SELECT 1 FROM shun WHERE shun.uuid=blob.uuid)", rcvid)
374 ){
375 style_submenu_element("Shun All", "Shun All", "shun?shun&rcvid=%d#addshun", rcvid);
 
376 }
377 if( db_exists(
378 "SELECT 1 FROM blob WHERE rcvid=%d AND"
379 " EXISTS (SELECT 1 FROM shun WHERE shun.uuid=blob.uuid)", rcvid)
380 ){
381 style_submenu_element("Unshun All", "Unshun All", "shun?accept&rcvid=%d#delshun", rcvid);
 
382 }
383 db_prepare(&q,
384 "SELECT login, datetime(rcvfrom.mtime), rcvfrom.ipaddr"
385 " FROM rcvfrom LEFT JOIN user USING(uid)"
386 " WHERE rcvid=%d",
@@ -399,22 +401,31 @@
399 @ <td valign="top">%s(zDate)</td></tr>
400 @ <tr><th valign="top" align="right">IP&nbsp;Address:</th>
401 @ <td valign="top">%s(zIpAddr)</td></tr>
402 }
403 db_finalize(&q);
 
 
 
 
 
404 db_prepare(&q,
405 "SELECT rid, uuid, size FROM blob WHERE rcvid=%d", rcvid
 
 
406 );
407 @ <tr><th valign="top" align="right">Artifacts:</th>
408 @ <td valign="top">
409 while( db_step(&q)==SQLITE_ROW ){
410 int rid = db_column_int(&q, 0);
411 const char *zUuid = db_column_text(&q, 1);
412 int size = db_column_int(&q, 2);
 
 
413 @ <a href="%s(g.zTop)/info/%s(zUuid)">%s(zUuid)</a>
414 @ (rid: %d(rid), size: %d(size))<br />
415 }
416 @ </td></tr>
417 @ </table>
418 db_finalize(&q);
419 style_footer();
420 }
421
--- src/shun.c
+++ src/shun.c
@@ -370,17 +370,19 @@
370 style_header("Content Source %d", rcvid);
371 if( db_exists(
372 "SELECT 1 FROM blob WHERE rcvid=%d AND"
373 " NOT EXISTS (SELECT 1 FROM shun WHERE shun.uuid=blob.uuid)", rcvid)
374 ){
375 style_submenu_element("Shun All", "Shun All",
376 "shun?shun&rcvid=%d#addshun", rcvid);
377 }
378 if( db_exists(
379 "SELECT 1 FROM blob WHERE rcvid=%d AND"
380 " EXISTS (SELECT 1 FROM shun WHERE shun.uuid=blob.uuid)", rcvid)
381 ){
382 style_submenu_element("Unshun All", "Unshun All",
383 "shun?accept&rcvid=%d#delshun", rcvid);
384 }
385 db_prepare(&q,
386 "SELECT login, datetime(rcvfrom.mtime), rcvfrom.ipaddr"
387 " FROM rcvfrom LEFT JOIN user USING(uid)"
388 " WHERE rcvid=%d",
@@ -399,22 +401,31 @@
401 @ <td valign="top">%s(zDate)</td></tr>
402 @ <tr><th valign="top" align="right">IP&nbsp;Address:</th>
403 @ <td valign="top">%s(zIpAddr)</td></tr>
404 }
405 db_finalize(&q);
406 db_multi_exec(
407 "CREATE TEMP TABLE toshow(rid INTEGER PRIMARY KEY);"
408 "INSERT INTO toshow SELECT rid FROM blob WHERE rcvid=%d", rcvid
409 );
410 describe_artifacts("IN toshow");
411 db_prepare(&q,
412 "SELECT blob.rid, blob.uuid, blob.size, description.summary\n"
413 " FROM blob LEFT JOIN description ON (blob.rid=description.rid)"
414 " WHERE blob.rcvid=%d", rcvid
415 );
416 @ <tr><th valign="top" align="right">Artifacts:</th>
417 @ <td valign="top">
418 while( db_step(&q)==SQLITE_ROW ){
419 int rid = db_column_int(&q, 0);
420 const char *zUuid = db_column_text(&q, 1);
421 int size = db_column_int(&q, 2);
422 const char *zDesc = db_column_text(&q, 3);
423 if( zDesc==0 ) zDesc = "";
424 @ <a href="%s(g.zTop)/info/%s(zUuid)">%s(zUuid)</a>
425 @ %h(zDesc) (size: %d(size))<br />
426 }
427 @ </td></tr>
428 @ </table>
429 db_finalize(&q);
430 style_footer();
431 }
432

Keyboard Shortcuts

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