Check-in [d53af79c81]
Not logged in

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

Overview
Comment:Fix the "card count" on sync to include the configuration cards sent and received.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: d53af79c81d3ccf76ae10b457ccbd9071c637373
User & Date: drh 2008-05-24 02:34:48.000
Context
2008-05-24
13:30
When reporting database errors in CGI mode, make sure the CGI header comes out first. check-in: 3dce979214 user: drh tags: trunk
02:34
Fix the "card count" on sync to include the configuration cards sent and received. check-in: d53af79c81 user: drh tags: trunk
2008-05-23
21:41
corrected wiki command short help check-in: 92df4748bd user: stephan tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/xfer.c.
839
840
841
842
843
844
845

846
847
848
849
850
851
852
    /* Send configuration parameter requests */
    if( configMask ){
      const char *zName;
      zName = configure_first_name(configMask);
      while( zName ){
        blob_appendf(&send, "reqconfig %s\n", zName);
        zName = configure_next_name(configMask);

      }
      configMask = 0;
    }

    /* Exchange messages with the server */
    nFileSend = xfer.nFileSent + xfer.nDeltaSent;
    printf(zValueFormat, "Send:",







>







839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
    /* Send configuration parameter requests */
    if( configMask ){
      const char *zName;
      zName = configure_first_name(configMask);
      while( zName ){
        blob_appendf(&send, "reqconfig %s\n", zName);
        zName = configure_next_name(configMask);
        nCard++;
      }
      configMask = 0;
    }

    /* Exchange messages with the server */
    nFileSend = xfer.nFileSent + xfer.nDeltaSent;
    printf(zValueFormat, "Send:",
967
968
969
970
971
972
973

974
975
976
977
978
979
980
        blob_extract(xfer.pIn, size, &content);
        if( configure_is_exportable(zName) & origConfigMask ){
          db_multi_exec(
              "REPLACE INTO config(name,value) VALUES(%Q,%Q)",
              zName, blob_str(&content)
          );
        }

        blob_reset(&content);
        blob_seek(xfer.pIn, 1, BLOB_SEEK_CUR);
      }else

      
      /*    cookie TEXT
      **







>







968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
        blob_extract(xfer.pIn, size, &content);
        if( configure_is_exportable(zName) & origConfigMask ){
          db_multi_exec(
              "REPLACE INTO config(name,value) VALUES(%Q,%Q)",
              zName, blob_str(&content)
          );
        }
        nCard++;
        blob_reset(&content);
        blob_seek(xfer.pIn, 1, BLOB_SEEK_CUR);
      }else

      
      /*    cookie TEXT
      **