Fossil SCM
Fix a bugs in the interwiki configuration transfer logic.
Commit
c959dde140adc6ffeb96fe5515d15776bd7d5afd0a28520a8678a3a813a20cc6
Parent
684fb15a7a8e924…
1 file changed
+3
-3
+3
-3
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -262,12 +262,12 @@ | ||
| 262 | 262 | } |
| 263 | 263 | } |
| 264 | 264 | if( strncmp(zName, "walias:/", 8)==0 ){ |
| 265 | 265 | return CONFIGSET_ALIAS; |
| 266 | 266 | } |
| 267 | - if( strncmp(zName, "intermap:/", 10)==0 ){ | |
| 268 | - return CONFIGSET_PROJ; | |
| 267 | + if( strncmp(zName, "interwiki:", 10)==0 ){ | |
| 268 | + return CONFIGSET_IWIKI; | |
| 269 | 269 | } |
| 270 | 270 | return 0; |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | /* |
| @@ -604,11 +604,11 @@ | ||
| 604 | 604 | } |
| 605 | 605 | db_finalize(&q); |
| 606 | 606 | } |
| 607 | 607 | if( groupMask & CONFIGSET_IWIKI ){ |
| 608 | 608 | db_prepare(&q, "SELECT mtime, quote(name), quote(value) FROM config" |
| 609 | - " WHERE name GLOB 'intermap:/*' AND mtime>=%lld", iStart); | |
| 609 | + " WHERE name GLOB 'interwiki:*' AND mtime>=%lld", iStart); | |
| 610 | 610 | while( db_step(&q)==SQLITE_ROW ){ |
| 611 | 611 | blob_appendf(&rec,"%s %s value %s", |
| 612 | 612 | db_column_text(&q, 0), |
| 613 | 613 | db_column_text(&q, 1), |
| 614 | 614 | db_column_text(&q, 2) |
| 615 | 615 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -262,12 +262,12 @@ | |
| 262 | } |
| 263 | } |
| 264 | if( strncmp(zName, "walias:/", 8)==0 ){ |
| 265 | return CONFIGSET_ALIAS; |
| 266 | } |
| 267 | if( strncmp(zName, "intermap:/", 10)==0 ){ |
| 268 | return CONFIGSET_PROJ; |
| 269 | } |
| 270 | return 0; |
| 271 | } |
| 272 | |
| 273 | /* |
| @@ -604,11 +604,11 @@ | |
| 604 | } |
| 605 | db_finalize(&q); |
| 606 | } |
| 607 | if( groupMask & CONFIGSET_IWIKI ){ |
| 608 | db_prepare(&q, "SELECT mtime, quote(name), quote(value) FROM config" |
| 609 | " WHERE name GLOB 'intermap:/*' AND mtime>=%lld", iStart); |
| 610 | while( db_step(&q)==SQLITE_ROW ){ |
| 611 | blob_appendf(&rec,"%s %s value %s", |
| 612 | db_column_text(&q, 0), |
| 613 | db_column_text(&q, 1), |
| 614 | db_column_text(&q, 2) |
| 615 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -262,12 +262,12 @@ | |
| 262 | } |
| 263 | } |
| 264 | if( strncmp(zName, "walias:/", 8)==0 ){ |
| 265 | return CONFIGSET_ALIAS; |
| 266 | } |
| 267 | if( strncmp(zName, "interwiki:", 10)==0 ){ |
| 268 | return CONFIGSET_IWIKI; |
| 269 | } |
| 270 | return 0; |
| 271 | } |
| 272 | |
| 273 | /* |
| @@ -604,11 +604,11 @@ | |
| 604 | } |
| 605 | db_finalize(&q); |
| 606 | } |
| 607 | if( groupMask & CONFIGSET_IWIKI ){ |
| 608 | db_prepare(&q, "SELECT mtime, quote(name), quote(value) FROM config" |
| 609 | " WHERE name GLOB 'interwiki:*' AND mtime>=%lld", iStart); |
| 610 | while( db_step(&q)==SQLITE_ROW ){ |
| 611 | blob_appendf(&rec,"%s %s value %s", |
| 612 | db_column_text(&q, 0), |
| 613 | db_column_text(&q, 1), |
| 614 | db_column_text(&q, 2) |
| 615 |