/ Check-in [62ede669]
Login

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

Overview
Comment:Minor fixes to FTS3 so that it works better when appended to the end of the amalgamation. (CVS 4769)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 62ede6699d8f116921a5a0baddca5e7e63740cd3
User & Date: drh 2008-02-01 15:34:10
Context
2008-02-01
19:42
fix broken OS/2 mutex implementation (Ticket #2905) (CVS 4770) check-in: 05afd86e user: pweilbacher tags: trunk
15:34
Minor fixes to FTS3 so that it works better when appended to the end of the amalgamation. (CVS 4769) check-in: 62ede669 user: drh tags: trunk
13:44
Fix the build scripts for windows binaries. ticket #2916. (CVS 4768) check-in: c336b231 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3.c.

284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
#include <string.h>
#include <ctype.h>

#include "fts3.h"
#include "fts3_hash.h"
#include "fts3_tokenizer.h"
#ifndef SQLITE_CORE 
  #include "sqlite3ext.h"
  SQLITE_EXTENSION_INIT1
#endif


/* TODO(shess) MAN, this thing needs some refactoring.  At minimum, it
** would be nice to order the file better, perhaps something along the
** lines of:







|







284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
#include <string.h>
#include <ctype.h>

#include "fts3.h"
#include "fts3_hash.h"
#include "fts3_tokenizer.h"
#ifndef SQLITE_CORE 
# include "sqlite3ext.h"
  SQLITE_EXTENSION_INIT1
#endif


/* TODO(shess) MAN, this thing needs some refactoring.  At minimum, it
** would be nice to order the file better, perhaps something along the
** lines of:

Changes to ext/fts3/fts3_tokenizer.c.

22
23
24
25
26
27
28

29

30
31
32
33
34
35
36
**
**     * The FTS3 module is being built into the core of
**       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)

#include "sqlite3ext.h"

SQLITE_EXTENSION_INIT1


#include "fts3_hash.h"
#include "fts3_tokenizer.h"
#include <assert.h>

/*
** Implementation of the SQL scalar function for accessing the underlying 







>
|
>







22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
**
**     * The FTS3 module is being built into the core of
**       SQLite (in which case SQLITE_ENABLE_FTS3 is defined).
*/
#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3)

#include "sqlite3ext.h"
#ifndef SQLITE_CORE
  SQLITE_EXTENSION_INIT1
#endif

#include "fts3_hash.h"
#include "fts3_tokenizer.h"
#include <assert.h>

/*
** Implementation of the SQL scalar function for accessing the underlying