Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Drop a couple variables which are no longer used anywhere. (CVS 3524) |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
08c2cc0e0782cfaca89947a01b7ea447 |
| User & Date: | shess 2006-11-29 23:41:10.000 |
Context
|
2006-11-30
| ||
| 13:05 | Fix indentation typo in btree.c. (CVS 3525) (check-in: 5d61486f0f user: drh tags: trunk) | |
|
2006-11-29
| ||
| 23:41 | Drop a couple variables which are no longer used anywhere. (CVS 3524) (check-in: 08c2cc0e07 user: shess tags: trunk) | |
| 21:03 | Test that terms longer than interior nodes work correctly. A bug prior to fts2.c r1.10 meant that such large terms caused an eventual stack overflow. (CVS 3523) (check-in: 66581162da user: shess tags: trunk) | |
Changes
Changes to ext/fts1/fts1.c.
| ︙ | ︙ | |||
1695 1696 1697 1698 1699 1700 1701 |
/*
** Find the first alphanumeric token in the string zIn. Null-terminate
** this token. Remove any quotation marks. And return a pointer to
** the result.
*/
static char *firstToken(char *zIn, char **pzTail){
| | < | 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 |
/*
** Find the first alphanumeric token in the string zIn. Null-terminate
** this token. Remove any quotation marks. And return a pointer to
** the result.
*/
static char *firstToken(char *zIn, char **pzTail){
int n, ttype;
while(1){
n = getToken(zIn, &ttype);
if( ttype==TOKEN_SPACE ){
zIn += n;
}else if( ttype==TOKEN_EOF ){
*pzTail = zIn;
return 0;
|
| ︙ | ︙ | |||
1765 1766 1767 1768 1769 1770 1771 |
* USING fts1(subject, body, tokenize mytokenizer(myarg))
*
* We return parsed information in a TableSpec structure.
*
*/
static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
char**pzErr){
| | | 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 |
* USING fts1(subject, body, tokenize mytokenizer(myarg))
*
* We return parsed information in a TableSpec structure.
*
*/
static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
char**pzErr){
int i, n;
char *z, *zDummy;
char **azArg;
const char *zTokenizer = 0; /* argv[] entry describing the tokenizer */
assert( argc>=3 );
/* Current interface:
** argv[0] - module name
|
| ︙ | ︙ | |||
1805 1806 1807 1808 1809 1810 1811 | /* Identify the column names and the tokenizer and delimiter arguments ** in the argv[][] array. */ pSpec->zName = azArg[2]; pSpec->nColumn = 0; pSpec->azColumn = azArg; zTokenizer = "tokenize simple"; | | | 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 |
/* Identify the column names and the tokenizer and delimiter arguments
** in the argv[][] array.
*/
pSpec->zName = azArg[2];
pSpec->nColumn = 0;
pSpec->azColumn = azArg;
zTokenizer = "tokenize simple";
for(i=3; i<argc; ++i){
if( startsWith(azArg[i],"tokenize") ){
zTokenizer = azArg[i];
}else{
z = azArg[pSpec->nColumn] = firstToken(azArg[i], &zDummy);
pSpec->nColumn++;
}
}
|
| ︙ | ︙ |
Changes to ext/fts2/fts2.c.
| ︙ | ︙ | |||
2287 2288 2289 2290 2291 2292 2293 |
/*
** Find the first alphanumeric token in the string zIn. Null-terminate
** this token. Remove any quotation marks. And return a pointer to
** the result.
*/
static char *firstToken(char *zIn, char **pzTail){
| | < | 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 |
/*
** Find the first alphanumeric token in the string zIn. Null-terminate
** this token. Remove any quotation marks. And return a pointer to
** the result.
*/
static char *firstToken(char *zIn, char **pzTail){
int n, ttype;
while(1){
n = getToken(zIn, &ttype);
if( ttype==TOKEN_SPACE ){
zIn += n;
}else if( ttype==TOKEN_EOF ){
*pzTail = zIn;
return 0;
|
| ︙ | ︙ | |||
2357 2358 2359 2360 2361 2362 2363 |
* USING fts2(subject, body, tokenize mytokenizer(myarg))
*
* We return parsed information in a TableSpec structure.
*
*/
static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
char**pzErr){
| | | 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 |
* USING fts2(subject, body, tokenize mytokenizer(myarg))
*
* We return parsed information in a TableSpec structure.
*
*/
static int parseSpec(TableSpec *pSpec, int argc, const char *const*argv,
char**pzErr){
int i, n;
char *z, *zDummy;
char **azArg;
const char *zTokenizer = 0; /* argv[] entry describing the tokenizer */
assert( argc>=3 );
/* Current interface:
** argv[0] - module name
|
| ︙ | ︙ | |||
2397 2398 2399 2400 2401 2402 2403 | /* Identify the column names and the tokenizer and delimiter arguments ** in the argv[][] array. */ pSpec->zName = azArg[2]; pSpec->nColumn = 0; pSpec->azColumn = azArg; zTokenizer = "tokenize simple"; | | | 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 |
/* Identify the column names and the tokenizer and delimiter arguments
** in the argv[][] array.
*/
pSpec->zName = azArg[2];
pSpec->nColumn = 0;
pSpec->azColumn = azArg;
zTokenizer = "tokenize simple";
for(i=3; i<argc; ++i){
if( startsWith(azArg[i],"tokenize") ){
zTokenizer = azArg[i];
}else{
z = azArg[pSpec->nColumn] = firstToken(azArg[i], &zDummy);
pSpec->nColumn++;
}
}
|
| ︙ | ︙ |