Fossil

Check-in [2cd21f8d]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix three remaining instances of printing rebuild progress in CGI mode. Ticket [19be0265ff].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dmitry-fixes
Files: files | file ages | folders
SHA1:2cd21f8dc2ec202e3ef4d771fd3d4ab426b98e7b
User & Date: dmitry 2011-09-11 13:57:32
References
2011-09-12
19:43 Fixed ticket [19be0265]: Rebuild button on Shun page on UI generates incorrect output plus 2 other changes artifact: e2604505 user: dmitry
Context
2011-09-12
18:19
Merge the minor fixes on the dmitry-fixes branch into trunk. check-in: ce354d0a user: drh tags: trunk
2011-09-11
13:57
Fix three remaining instances of printing rebuild progress in CGI mode. Ticket [19be0265ff]. Closed-Leaf check-in: 2cd21f8d user: dmitry tags: dmitry-fixes
12:27
Disallow creating users with empty login. Ticket [66ce1088]. check-in: e1ea6c26 user: dmitry tags: dmitry-fixes
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/rebuild.c.

336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
...
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
  int errCnt = 0;
  char *zTable;
  int incrSize;

  bag_init(&bagDone);
  ttyOutput = doOut;
  processCnt = 0;
  if (!g.fQuiet) {
    percent_complete(0);
  }
  rebuild_update_schema();
  for(;;){
    zTable = db_text(0,
       "SELECT name FROM sqlite_master /*scan*/"
       " WHERE type='table'"
................................................................................
      db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
      rebuild_step_done(rid);
    }
  }
  db_finalize(&s);
  manifest_crosslink_end();
  rebuild_tag_trunk();
  if( !g.fQuiet && totalSize>0 ){
    processCnt += incrSize;
    percent_complete((processCnt*1000)/totalSize);
  }
  if( doClustering ) create_cluster();
  if( !g.fQuiet && totalSize>0 ){
    processCnt += incrSize;
    percent_complete((processCnt*1000)/totalSize);
  }
  if(!g.fQuiet && ttyOutput ){
    fossil_print("\n");
  }
  return errCnt;







|







 







|




|







336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
...
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
  int errCnt = 0;
  char *zTable;
  int incrSize;

  bag_init(&bagDone);
  ttyOutput = doOut;
  processCnt = 0;
  if (ttyOutput && !g.fQuiet) {
    percent_complete(0);
  }
  rebuild_update_schema();
  for(;;){
    zTable = db_text(0,
       "SELECT name FROM sqlite_master /*scan*/"
       " WHERE type='table'"
................................................................................
      db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
      rebuild_step_done(rid);
    }
  }
  db_finalize(&s);
  manifest_crosslink_end();
  rebuild_tag_trunk();
  if( ttyOutput && !g.fQuiet && totalSize>0 ){
    processCnt += incrSize;
    percent_complete((processCnt*1000)/totalSize);
  }
  if( doClustering ) create_cluster();
  if( ttyOutput && !g.fQuiet && totalSize>0 ){
    processCnt += incrSize;
    percent_complete((processCnt*1000)/totalSize);
  }
  if(!g.fQuiet && ttyOutput ){
    fossil_print("\n");
  }
  return errCnt;