Fossil SCM

Begin adding a search capability; the code is not yet connected up. Also update to the latest version of SQLite.

drh 2009-10-18 18:21 trunk

Commit 232d10b7365e2d0775972d351b8eb0b1ce93a236

Parent 076f7adff24d807…

5 files changed +12 -2 +1 +169 +4 -4 +1 -1

~ src/main.mk ~ src/makemake.tcl + src/search.c ~ src/sqlite3.c ~ src/sqlite3.h

M src/main.mk

+12 -2

		--- src/main.mk
		+++ src/main.mk
		@@ -55,10 +55,11 @@
55	55	$(SRCDIR)/rebuild.c \
56	56	$(SRCDIR)/report.c \
57	57	$(SRCDIR)/rss.c \
58	58	$(SRCDIR)/rstats.c \
59	59	$(SRCDIR)/schema.c \
	60	+ $(SRCDIR)/search.c \
60	61	$(SRCDIR)/setup.c \
61	62	$(SRCDIR)/sha1.c \
62	63	$(SRCDIR)/shun.c \
63	64	$(SRCDIR)/stat.c \
64	65	$(SRCDIR)/style.c \
		@@ -123,10 +124,11 @@
123	124	rebuild_.c \
124	125	report_.c \
125	126	rss_.c \
126	127	rstats_.c \
127	128	schema_.c \
	129	+ search_.c \
128	130	setup_.c \
129	131	sha1_.c \
130	132	shun_.c \
131	133	stat_.c \
132	134	style_.c \
		@@ -191,10 +193,11 @@
191	193	rebuild.o \
192	194	report.o \
193	195	rss.o \
194	196	rstats.o \
195	197	schema.o \
	198	+ search.o \
196	199	setup.o \
197	200	sha1.o \
198	201	shun.o \
199	202	stat.o \
200	203	style.o \
		@@ -255,16 +258,16 @@
255	258	# noop
256	259
257	260	clean:
258	261	rm -f .o _.c $(APPNAME) VERSION.h
259	262	rm -f translate makeheaders mkindex page_index.h headers
260		- rm -f add.h allrepo.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h construct.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h http.h http_socket.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h pqueue.h printf.h rebuild.h report.h rss.h rstats.h schema.h setup.h sha1.h shun.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
	263	+ rm -f add.h allrepo.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h construct.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h http.h http_socket.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h pqueue.h printf.h rebuild.h report.h rss.h rstats.h schema.h search.h setup.h sha1.h shun.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
261	264
262	265	page_index.h: $(TRANS_SRC) mkindex
263	266	./mkindex $(TRANS_SRC) >$@
264	267	headers: page_index.h makeheaders VERSION.h
265		- ./makeheaders add_.c:add.h allrepo_.c:allrepo.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h construct_.c:construct.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h http_.c:http.h http_socket_.c:http_socket.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h rstats_.c:rstats.h schema_.c:schema.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
	268	+ ./makeheaders add_.c:add.h allrepo_.c:allrepo.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h construct_.c:construct.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h http_.c:http.h http_socket_.c:http_socket.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h rstats_.c:rstats.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
266	269	touch headers
267	270	headers: Makefile
268	271	Makefile:
269	272	add_.c: $(SRCDIR)/add.c translate
270	273	./translate $(SRCDIR)/add.c >add_.c
		@@ -572,10 +575,17 @@
572	575
573	576	schema.o: schema_.c schema.h $(SRCDIR)/config.h
574	577	$(XTCC) -o schema.o -c schema_.c
575	578
576	579	schema.h: headers
	580	+search_.c: $(SRCDIR)/search.c translate
	581	+ ./translate $(SRCDIR)/search.c >search_.c
	582	+
	583	+search.o: search_.c search.h $(SRCDIR)/config.h
	584	+ $(XTCC) -o search.o -c search_.c
	585	+
	586	+search.h: headers
577	587	setup_.c: $(SRCDIR)/setup.c translate
578	588	./translate $(SRCDIR)/setup.c >setup_.c
579	589
580	590	setup.o: setup_.c setup.h $(SRCDIR)/config.h
581	591	$(XTCC) -o setup.o -c setup_.c
582	592

	--- src/main.mk
	+++ src/main.mk
	@@ -55,10 +55,11 @@
55	$(SRCDIR)/rebuild.c \
56	$(SRCDIR)/report.c \
57	$(SRCDIR)/rss.c \
58	$(SRCDIR)/rstats.c \
59	$(SRCDIR)/schema.c \

60	$(SRCDIR)/setup.c \
61	$(SRCDIR)/sha1.c \
62	$(SRCDIR)/shun.c \
63	$(SRCDIR)/stat.c \
64	$(SRCDIR)/style.c \
	@@ -123,10 +124,11 @@
123	rebuild_.c \
124	report_.c \
125	rss_.c \
126	rstats_.c \
127	schema_.c \

128	setup_.c \
129	sha1_.c \
130	shun_.c \
131	stat_.c \
132	style_.c \
	@@ -191,10 +193,11 @@
191	rebuild.o \
192	report.o \
193	rss.o \
194	rstats.o \
195	schema.o \

196	setup.o \
197	sha1.o \
198	shun.o \
199	stat.o \
200	style.o \
	@@ -255,16 +258,16 @@
255	# noop
256
257	clean:
258	rm -f .o _.c $(APPNAME) VERSION.h
259	rm -f translate makeheaders mkindex page_index.h headers
260	rm -f add.h allrepo.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h construct.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h http.h http_socket.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h pqueue.h printf.h rebuild.h report.h rss.h rstats.h schema.h setup.h sha1.h shun.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
261
262	page_index.h: $(TRANS_SRC) mkindex
263	./mkindex $(TRANS_SRC) >$@
264	headers: page_index.h makeheaders VERSION.h
265	./makeheaders add_.c:add.h allrepo_.c:allrepo.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h construct_.c:construct.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h http_.c:http.h http_socket_.c:http_socket.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h rstats_.c:rstats.h schema_.c:schema.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
266	touch headers
267	headers: Makefile
268	Makefile:
269	add_.c: $(SRCDIR)/add.c translate
270	./translate $(SRCDIR)/add.c >add_.c
	@@ -572,10 +575,17 @@
572
573	schema.o: schema_.c schema.h $(SRCDIR)/config.h
574	$(XTCC) -o schema.o -c schema_.c
575
576	schema.h: headers







577	setup_.c: $(SRCDIR)/setup.c translate
578	./translate $(SRCDIR)/setup.c >setup_.c
579
580	setup.o: setup_.c setup.h $(SRCDIR)/config.h
581	$(XTCC) -o setup.o -c setup_.c
582

	--- src/main.mk
	+++ src/main.mk
	@@ -55,10 +55,11 @@
55	$(SRCDIR)/rebuild.c \
56	$(SRCDIR)/report.c \
57	$(SRCDIR)/rss.c \
58	$(SRCDIR)/rstats.c \
59	$(SRCDIR)/schema.c \
60	$(SRCDIR)/search.c \
61	$(SRCDIR)/setup.c \
62	$(SRCDIR)/sha1.c \
63	$(SRCDIR)/shun.c \
64	$(SRCDIR)/stat.c \
65	$(SRCDIR)/style.c \
	@@ -123,10 +124,11 @@
124	rebuild_.c \
125	report_.c \
126	rss_.c \
127	rstats_.c \
128	schema_.c \
129	search_.c \
130	setup_.c \
131	sha1_.c \
132	shun_.c \
133	stat_.c \
134	style_.c \
	@@ -191,10 +193,11 @@
193	rebuild.o \
194	report.o \
195	rss.o \
196	rstats.o \
197	schema.o \
198	search.o \
199	setup.o \
200	sha1.o \
201	shun.o \
202	stat.o \
203	style.o \
	@@ -255,16 +258,16 @@
258	# noop
259
260	clean:
261	rm -f .o _.c $(APPNAME) VERSION.h
262	rm -f translate makeheaders mkindex page_index.h headers
263	rm -f add.h allrepo.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h construct.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h http.h http_socket.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h pqueue.h printf.h rebuild.h report.h rss.h rstats.h schema.h search.h setup.h sha1.h shun.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
264
265	page_index.h: $(TRANS_SRC) mkindex
266	./mkindex $(TRANS_SRC) >$@
267	headers: page_index.h makeheaders VERSION.h
268	./makeheaders add_.c:add.h allrepo_.c:allrepo.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h construct_.c:construct.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h http_.c:http.h http_socket_.c:http_socket.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h rstats_.c:rstats.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
269	touch headers
270	headers: Makefile
271	Makefile:
272	add_.c: $(SRCDIR)/add.c translate
273	./translate $(SRCDIR)/add.c >add_.c
	@@ -572,10 +575,17 @@
575
576	schema.o: schema_.c schema.h $(SRCDIR)/config.h
577	$(XTCC) -o schema.o -c schema_.c
578
579	schema.h: headers
580	search_.c: $(SRCDIR)/search.c translate
581	./translate $(SRCDIR)/search.c >search_.c
582
583	search.o: search_.c search.h $(SRCDIR)/config.h
584	$(XTCC) -o search.o -c search_.c
585
586	search.h: headers
587	setup_.c: $(SRCDIR)/setup.c translate
588	./translate $(SRCDIR)/setup.c >setup_.c
589
590	setup.o: setup_.c setup.h $(SRCDIR)/config.h
591	$(XTCC) -o setup.o -c setup_.c
592

M src/makemake.tcl

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -49,10 +49,11 @@
49	49	rebuild
50	50	report
51	51	rss
52	52	rstats
53	53	schema
	54	+ search
54	55	setup
55	56	sha1
56	57	shun
57	58	stat
58	59	style
59	60
60	61	ADDED src/search.c

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -49,10 +49,11 @@
49	rebuild
50	report
51	rss
52	rstats
53	schema

54	setup
55	sha1
56	shun
57	stat
58	style
59
60	DDED src/search.c

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -49,10 +49,11 @@
49	rebuild
50	report
51	rss
52	rstats
53	schema
54	search
55	setup
56	sha1
57	shun
58	stat
59	style
60
61	DDED src/search.c

A src/search.c

+169

		--- a/src/search.c
		+++ b/src/search.c
		@@ -0,0 +1,169 @@
	1	+if( nHdr \|\| f( nHdr \|\| zType[0]!='d' e[0]!='d' ){elsnLimit, 80f( nHdr \|\| zType[0]!='d' ){zType[0]!='d' ){else{value(context, argv[2]);
	2	+ }body GNU General Public
	3	+** License version 2 as published by the Free Software Foundation.
	4	+**);
	5	+ }bodycore() AS y AND y>08]
	6	+};
	7	+#endif){
	8	+ int nsearch*
	9	+** %fossil tstheWITHOUT ANY WARRANTYar const * zLimMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	10	+** General Public License for more details.
	11	+**
	12	+** You should have received a copy of the GNU General Public
	13	+** License along with this library; if not, write to the
	14	+** Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	15	+** Boston, MA 02111-1307, USAdr \|\| f( nHdr \|\| zType[0]!='d' e[0]!='d' ){elsnLimit, 80f( nHdr \|\| zType[0]!='d' ){zType[0]!='d' ){else{value(context, argv[2]);
	16	+ }body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	17	+ }bodycore() AS y AND y>08]
	18	+};
	19	+#endif){
	20	+ int nsearch*
	21	+** %fossil tsthe "/doc" we
	22	+ struct srchTerm {
	23	+ chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
	24	+ struct winsize w;
	25	+ ioctl(0, TIOCGWINSZ, &w);
	26	+ width = w.ws_col;
	27	+# width = 79;-width\|-W if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	28	+ }bodycore() AS y AND y>08]
	29	+};
	30	+#endif){
	31	+ int nsearch*
	32	+** %fossil tsthe "/doc" we
	33	+ struct srchTerm {
	34	+ chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
	35	+ struct winsize w;
	36	+ ioctl(0, TIOCGWINSZ, &w);
	37	+ width = w.ws_col;
	38	+if( nH of entries
	39	+** returned79, 'localtime'cons20;1000f( nHdr \|\| zType[0]!='d' ){elselue(context, argv[2]);
	40	+ }body if( nHdr \|\| zType[0]!='d' ){else{vaaue(context, argv[2]);
	41	+ }bodycore() AS y AND y>08]
	42	+};
	43	+#endif){
	44	+ int nsearch*
	45	+** %fossil tsthe "/doc" we
	46	+ struct sr{
	47	+ chfblif( p==0 ) fchfblob_strhar const * zLstrcpy(z, zPatternct winsize w;
	48	+ ioctl(0, TIOCGWINSZ, &w);
	49	+ width = w.ws_col;
	50	+# width = 79;-width\|-W value(context, argv[2]);
	51	+ }bodycore() AS y AND y>08]
	52	+};
	53	+#endif){
	54	+ int nsearch*
	55	+** %fossit nserch*
	56	+** %fossil tsthe "/doc" we
	57	+ struct srchTerm {
	58	+ chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
	59	+ struct winsize w;
	60	+ ioctl(4h = w.ws_col;
	61	+if( nH of entries
	62	+** returned79, 'localtime'if(nLimit>0sql, "LIMIT %d", nLimit);
	63	+ }entries
	64	+-1; /* Max'd' ){zType[0]!='d' ){else{value(context, argv[2]);
	65	+ }body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	66	+ }bodycore() AS y AND y>08]
	67	+};
	68	+#endif){
	69	+ int nsearch*
	70	+** %fossil tsthe "/doc" we
	71	+ struct srchTerm {
	72	+ chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
	73	+ struct winsize w;
	74	+ ioctl(0, TIOCGWINSZ, &w);
	75	+ width = w.ws_col;
	76	+# width = 79;-width\|-W if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	77	+ }bodycore() AS y AND y>08]
	78	+};
	79	+#endif){
	80	+ int nsearch*
	81	+** %fossil tsthe "/doc" we
	82	+ struct srchTerm {
	83	+ chf4lob_strhar c4SZ
	84	+ struct winsi4e w;
	85	+ ioctl(0, TIOCGWINSZ, &w);
	86	+ width = w.ws_col;
	87	+if( nH of ent4ies
	88	+** returned79, 'localtime'c4if( nHdr \|\| f( nHdr \|\| zType[0]!='d' e[0]!='d' ){elsnLimit, 80f( nHdr \|\| zType[0]!='d' ){zType[0]!='d' ){else{value(context, argv[2]);
	89	+ }body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	90	+ }bodycore()]returned79, 'localtime'if(nLimit>0sql, "LIMIT %d", nLimit);
	91	+ }entries
	92	+-1; /* Max'd' ){zType[0]!='d' ){else{value(context, argv[2]);
	93	+ }body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	94	+ }bodycore() AS y AND y>08]
	95	+};
	96	+#endif){
	97	+ int nsearch*
	98	+** %foss4IMIT %d", nLimit);
	99	+ }entries
	100	+-1; /* Max'd' ){zType[0]!='d' ){else{value(context, argv[2]);
	101	+ }body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	102	+ }bodycore() AS y AND y>08]
	103	+};
	104	+#endif){
	105	+ int nsearch*
	106	+** %fossil tsthif (zDoif( nHdr \|\| f( nHdr \|\| zType[0]!='d' e[0]!='d' ){elsnLimit, 80f( nHdr \|\| zType[0]!='d' ){zType[0]!='d' ){else{value(context, argv[2]);
	107	+ }body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	108	+ }bodycore() AS y AND y>08]
	109	+};
	110	+#endif){
	111	+ int nsearch*
	112	+** %fossil tsthe "/doc" we
	113	+ struct srchTerm {
	114	+ chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
	115	+ struct winsize w;
	116	+ ioctl(0, TIOCGWINSZ, &w);
	117	+ width = w.ws_col;
	118	+# width = 79;-width\|-W if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	119	+ }bodycore() AS y AND y>08]
	120	+};
	121	+#endif){
	122	+ int nsearch*
	123	+** %fossil tsthe "/doc" we
	124	+ struct srchTerm {
	125	+ chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
	126	+ struct winsize w;
	127	+ ioctl(0, TIOCGWINSZ, &w);
	128	+ width = w.ws_col;
	129	+if( nH of entries
	130	+** returned79, 'localtime'cons20;1000f( nHdr \|\| zType[0]!='d' ){elselue(context, argv[2]);
	131	+ }body if( nHdr \|\| zType[0]!='d' ){else{vaaue(context, argv[2]);
	132	+ }bodycore() AS y AND y>08]
	133	+};
	134	+#endif){
	135	+ int nsearch*
	136	+** %fossil tsthe "/doc" we
	137	+ struct sr{
	138	+ chfblif( p==0 ) fchfblob_strhar const * zLstrcpy(z, zPatternct test-winsize w;
	139	+ ioctest-search pattern..width = 79;-width\|-W value(context, argv[2]);
	140	+ }bodycore() AS y AND y>08]
	141	+};
	142	+#endif){
	143	+ int nsearch*
	144	+** %fossit nserch*
	145	+** %fossil tsthe "/doc" we
	146	+ struct srchTerm {
	147	+ chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
	148	+ struct winsize w;
	149	+ ioctl(4h = w.ws_col;
	150	+if( nH of entries
	151	+** returned79, 'localtime'if(nLimit>0sql, "LIMIT %d", nLimit);
	152	+ }entries
	153	+-1; /* Max'd' ){zType[0]!='d' ){else{value(context, argv[2]);
	154	+ }body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	155	+ }bodycore() AS y AND y>08]
	156	+};
	157	+#endif){
	158	+ int nsearch*
	159	+** %fossil tsthe "/doc" we
	160	+ struct srchTerm {
	161	+ chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
	162	+ struct winsize w;
	163	+ ioctl(0, TIOCGWINSZ, &w);
	164	+ width = w.ws_col;
	165	+# width = 79;-width\|-W if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
	166	+ }bodycore() AS y AND y>08]
	167	+};
	168	+#endif){
	169	+ i

	--- a/src/search.c
	+++ b/src/search.c
	@@ -0,0 +1,169 @@

	--- a/src/search.c
	+++ b/src/search.c
	@@ -0,0 +1,169 @@
1	if( nHdr \|\| f( nHdr \|\| zType[0]!='d' e[0]!='d' ){elsnLimit, 80f( nHdr \|\| zType[0]!='d' ){zType[0]!='d' ){else{value(context, argv[2]);
2	}body GNU General Public
3	** License version 2 as published by the Free Software Foundation.
4	**);
5	}bodycore() AS y AND y>08]
6	};
7	#endif){
8	int nsearch*
9	** %fossil tstheWITHOUT ANY WARRANTYar const * zLimMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10	** General Public License for more details.
11	**
12	** You should have received a copy of the GNU General Public
13	** License along with this library; if not, write to the
14	** Free Software Foundation, Inc., 59 Temple Place - Suite 330,
15	** Boston, MA 02111-1307, USAdr \|\| f( nHdr \|\| zType[0]!='d' e[0]!='d' ){elsnLimit, 80f( nHdr \|\| zType[0]!='d' ){zType[0]!='d' ){else{value(context, argv[2]);
16	}body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
17	}bodycore() AS y AND y>08]
18	};
19	#endif){
20	int nsearch*
21	** %fossil tsthe "/doc" we
22	struct srchTerm {
23	chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
24	struct winsize w;
25	ioctl(0, TIOCGWINSZ, &w);
26	width = w.ws_col;
27	# width = 79;-width\|-W if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
28	}bodycore() AS y AND y>08]
29	};
30	#endif){
31	int nsearch*
32	** %fossil tsthe "/doc" we
33	struct srchTerm {
34	chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
35	struct winsize w;
36	ioctl(0, TIOCGWINSZ, &w);
37	width = w.ws_col;
38	if( nH of entries
39	** returned79, 'localtime'cons20;1000f( nHdr \|\| zType[0]!='d' ){elselue(context, argv[2]);
40	}body if( nHdr \|\| zType[0]!='d' ){else{vaaue(context, argv[2]);
41	}bodycore() AS y AND y>08]
42	};
43	#endif){
44	int nsearch*
45	** %fossil tsthe "/doc" we
46	struct sr{
47	chfblif( p==0 ) fchfblob_strhar const * zLstrcpy(z, zPatternct winsize w;
48	ioctl(0, TIOCGWINSZ, &w);
49	width = w.ws_col;
50	# width = 79;-width\|-W value(context, argv[2]);
51	}bodycore() AS y AND y>08]
52	};
53	#endif){
54	int nsearch*
55	** %fossit nserch*
56	** %fossil tsthe "/doc" we
57	struct srchTerm {
58	chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
59	struct winsize w;
60	ioctl(4h = w.ws_col;
61	if( nH of entries
62	** returned79, 'localtime'if(nLimit>0sql, "LIMIT %d", nLimit);
63	}entries
64	-1; /* Max'd' ){zType[0]!='d' ){else{value(context, argv[2]);
65	}body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
66	}bodycore() AS y AND y>08]
67	};
68	#endif){
69	int nsearch*
70	** %fossil tsthe "/doc" we
71	struct srchTerm {
72	chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
73	struct winsize w;
74	ioctl(0, TIOCGWINSZ, &w);
75	width = w.ws_col;
76	# width = 79;-width\|-W if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
77	}bodycore() AS y AND y>08]
78	};
79	#endif){
80	int nsearch*
81	** %fossil tsthe "/doc" we
82	struct srchTerm {
83	chf4lob_strhar c4SZ
84	struct winsi4e w;
85	ioctl(0, TIOCGWINSZ, &w);
86	width = w.ws_col;
87	if( nH of ent4ies
88	** returned79, 'localtime'c4if( nHdr \|\| f( nHdr \|\| zType[0]!='d' e[0]!='d' ){elsnLimit, 80f( nHdr \|\| zType[0]!='d' ){zType[0]!='d' ){else{value(context, argv[2]);
89	}body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
90	}bodycore()]returned79, 'localtime'if(nLimit>0sql, "LIMIT %d", nLimit);
91	}entries
92	-1; /* Max'd' ){zType[0]!='d' ){else{value(context, argv[2]);
93	}body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
94	}bodycore() AS y AND y>08]
95	};
96	#endif){
97	int nsearch*
98	** %foss4IMIT %d", nLimit);
99	}entries
100	-1; /* Max'd' ){zType[0]!='d' ){else{value(context, argv[2]);
101	}body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
102	}bodycore() AS y AND y>08]
103	};
104	#endif){
105	int nsearch*
106	** %fossil tsthif (zDoif( nHdr \|\| f( nHdr \|\| zType[0]!='d' e[0]!='d' ){elsnLimit, 80f( nHdr \|\| zType[0]!='d' ){zType[0]!='d' ){else{value(context, argv[2]);
107	}body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
108	}bodycore() AS y AND y>08]
109	};
110	#endif){
111	int nsearch*
112	** %fossil tsthe "/doc" we
113	struct srchTerm {
114	chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
115	struct winsize w;
116	ioctl(0, TIOCGWINSZ, &w);
117	width = w.ws_col;
118	# width = 79;-width\|-W if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
119	}bodycore() AS y AND y>08]
120	};
121	#endif){
122	int nsearch*
123	** %fossil tsthe "/doc" we
124	struct srchTerm {
125	chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
126	struct winsize w;
127	ioctl(0, TIOCGWINSZ, &w);
128	width = w.ws_col;
129	if( nH of entries
130	** returned79, 'localtime'cons20;1000f( nHdr \|\| zType[0]!='d' ){elselue(context, argv[2]);
131	}body if( nHdr \|\| zType[0]!='d' ){else{vaaue(context, argv[2]);
132	}bodycore() AS y AND y>08]
133	};
134	#endif){
135	int nsearch*
136	** %fossil tsthe "/doc" we
137	struct sr{
138	chfblif( p==0 ) fchfblob_strhar const * zLstrcpy(z, zPatternct test-winsize w;
139	ioctest-search pattern..width = 79;-width\|-W value(context, argv[2]);
140	}bodycore() AS y AND y>08]
141	};
142	#endif){
143	int nsearch*
144	** %fossit nserch*
145	** %fossil tsthe "/doc" we
146	struct srchTerm {
147	chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
148	struct winsize w;
149	ioctl(4h = w.ws_col;
150	if( nH of entries
151	** returned79, 'localtime'if(nLimit>0sql, "LIMIT %d", nLimit);
152	}entries
153	-1; /* Max'd' ){zType[0]!='d' ){else{value(context, argv[2]);
154	}body if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
155	}bodycore() AS y AND y>08]
156	};
157	#endif){
158	int nsearch*
159	** %fossil tsthe "/doc" we
160	struct srchTerm {
161	chfblob_strhar const * zLimit#ifdef TIOCGWINSZ
162	struct winsize w;
163	ioctl(0, TIOCGWINSZ, &w);
164	width = w.ws_col;
165	# width = 79;-width\|-W if( nHdr \|\| zType[0]!='d' ){else{value(context, argv[2]);
166	}bodycore() AS y AND y>08]
167	};
168	#endif){
169	i

M src/sqlite3.c

+4 -4

		--- src/sqlite3.c
		+++ src/sqlite3.c
		@@ -15,11 +15,11 @@
15	15	** of the embedded sqlite3.h header file.) Additional code files may be needed
16	16	** if you want a wrapper to interface SQLite with your choice of programming
17	17	** language. The code for the "sqlite3" command-line shell is also in a
18	18	** separate file. This file contains only code for the core SQLite library.
19	19	**
20		-** This amalgamation was generated on 2009-10-13 16:22:00 UTC.
	20	+** This amalgamation was generated on 2009-10-14 11:34:12 UTC.
21	21	*/
22	22	#define SQLITE_CORE 1
23	23	#define SQLITE_AMALGAMATION 1
24	24	#ifndef SQLITE_PRIVATE
25	25	# define SQLITE_PRIVATE static
		@@ -651,11 +651,11 @@
651	651	**
652	652	** Requirements: [H10011] [H10014]
653	653	*/
654	654	#define SQLITE_VERSION "3.6.19"
655	655	#define SQLITE_VERSION_NUMBER 3006019
656		-#define SQLITE_SOURCE_ID "2009-10-13 15:42:49 f894ebf86d6bafcd1461f104f5f677b3b6a3aa1a"
	656	+#define SQLITE_SOURCE_ID "2009-10-14 11:33:55 c1d499afc50d54b376945b4efb65c56c787a073d"
657	657
658	658	/*
659	659	** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
660	660	** KEYWORDS: sqlite3_version
661	661	**
		@@ -8616,11 +8616,11 @@
8616	8616	** opened savepoint. Savepoints are added to the list by the vdbe
8617	8617	** OP_Savepoint instruction.
8618	8618	*/
8619	8619	struct Savepoint {
8620	8620	char zName; / Savepoint name (nul-terminated) */
8621		- int nDeferredCons; /* Number of deferred fk violations */
	8621	+ i64 nDeferredCons; /* Number of deferred fk violations */
8622	8622	Savepoint pNext; / Parent savepoint (if any) */
8623	8623	};
8624	8624
8625	8625	/*
8626	8626	** The following are used as the second parameter to sqlite3Savepoint(),
		@@ -83927,11 +83927,11 @@
83927	83927	/* Set the P5 operand of the OP_Program instruction to non-zero if
83928	83928	** recursive invocation of this trigger program is disallowed. Recursive
83929	83929	** invocation is disallowed if (a) the sub-program is really a trigger,
83930	83930	** not a foreign key action, and (b) the flag to enable recursive triggers
83931	83931	** is clear. */
83932		- sqlite3VdbeChangeP5(v, p->zName && !(pParse->db->flags&SQLITE_RecTriggers));
	83932	+ sqlite3VdbeChangeP5(v, (u8)(p->zName && !(pParse->db->flags&SQLITE_RecTriggers)));
83933	83933	}
83934	83934	}
83935	83935
83936	83936	/*
83937	83937	** This is called to code the required FOR EACH ROW triggers for an operation
83938	83938

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -15,11 +15,11 @@
15	** of the embedded sqlite3.h header file.) Additional code files may be needed
16	** if you want a wrapper to interface SQLite with your choice of programming
17	** language. The code for the "sqlite3" command-line shell is also in a
18	** separate file. This file contains only code for the core SQLite library.
19	**
20	** This amalgamation was generated on 2009-10-13 16:22:00 UTC.
21	*/
22	#define SQLITE_CORE 1
23	#define SQLITE_AMALGAMATION 1
24	#ifndef SQLITE_PRIVATE
25	# define SQLITE_PRIVATE static
	@@ -651,11 +651,11 @@
651	**
652	** Requirements: [H10011] [H10014]
653	*/
654	#define SQLITE_VERSION "3.6.19"
655	#define SQLITE_VERSION_NUMBER 3006019
656	#define SQLITE_SOURCE_ID "2009-10-13 15:42:49 f894ebf86d6bafcd1461f104f5f677b3b6a3aa1a"
657
658	/*
659	** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
660	** KEYWORDS: sqlite3_version
661	**
	@@ -8616,11 +8616,11 @@
8616	** opened savepoint. Savepoints are added to the list by the vdbe
8617	** OP_Savepoint instruction.
8618	*/
8619	struct Savepoint {
8620	char zName; / Savepoint name (nul-terminated) */
8621	int nDeferredCons; /* Number of deferred fk violations */
8622	Savepoint pNext; / Parent savepoint (if any) */
8623	};
8624
8625	/*
8626	** The following are used as the second parameter to sqlite3Savepoint(),
	@@ -83927,11 +83927,11 @@
83927	/* Set the P5 operand of the OP_Program instruction to non-zero if
83928	** recursive invocation of this trigger program is disallowed. Recursive
83929	** invocation is disallowed if (a) the sub-program is really a trigger,
83930	** not a foreign key action, and (b) the flag to enable recursive triggers
83931	** is clear. */
83932	sqlite3VdbeChangeP5(v, p->zName && !(pParse->db->flags&SQLITE_RecTriggers));
83933	}
83934	}
83935
83936	/*
83937	** This is called to code the required FOR EACH ROW triggers for an operation
83938

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -15,11 +15,11 @@
15	** of the embedded sqlite3.h header file.) Additional code files may be needed
16	** if you want a wrapper to interface SQLite with your choice of programming
17	** language. The code for the "sqlite3" command-line shell is also in a
18	** separate file. This file contains only code for the core SQLite library.
19	**
20	** This amalgamation was generated on 2009-10-14 11:34:12 UTC.
21	*/
22	#define SQLITE_CORE 1
23	#define SQLITE_AMALGAMATION 1
24	#ifndef SQLITE_PRIVATE
25	# define SQLITE_PRIVATE static
	@@ -651,11 +651,11 @@
651	**
652	** Requirements: [H10011] [H10014]
653	*/
654	#define SQLITE_VERSION "3.6.19"
655	#define SQLITE_VERSION_NUMBER 3006019
656	#define SQLITE_SOURCE_ID "2009-10-14 11:33:55 c1d499afc50d54b376945b4efb65c56c787a073d"
657
658	/*
659	** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
660	** KEYWORDS: sqlite3_version
661	**
	@@ -8616,11 +8616,11 @@
8616	** opened savepoint. Savepoints are added to the list by the vdbe
8617	** OP_Savepoint instruction.
8618	*/
8619	struct Savepoint {
8620	char zName; / Savepoint name (nul-terminated) */
8621	i64 nDeferredCons; /* Number of deferred fk violations */
8622	Savepoint pNext; / Parent savepoint (if any) */
8623	};
8624
8625	/*
8626	** The following are used as the second parameter to sqlite3Savepoint(),
	@@ -83927,11 +83927,11 @@
83927	/* Set the P5 operand of the OP_Program instruction to non-zero if
83928	** recursive invocation of this trigger program is disallowed. Recursive
83929	** invocation is disallowed if (a) the sub-program is really a trigger,
83930	** not a foreign key action, and (b) the flag to enable recursive triggers
83931	** is clear. */
83932	sqlite3VdbeChangeP5(v, (u8)(p->zName && !(pParse->db->flags&SQLITE_RecTriggers)));
83933	}
83934	}
83935
83936	/*
83937	** This is called to code the required FOR EACH ROW triggers for an operation
83938

M src/sqlite3.h

+1 -1

		--- src/sqlite3.h
		+++ src/sqlite3.h
		@@ -119,11 +119,11 @@
119	119	**
120	120	** Requirements: [H10011] [H10014]
121	121	*/
122	122	#define SQLITE_VERSION "3.6.19"
123	123	#define SQLITE_VERSION_NUMBER 3006019
124		-#define SQLITE_SOURCE_ID "2009-10-13 15:42:49 f894ebf86d6bafcd1461f104f5f677b3b6a3aa1a"
	124	+#define SQLITE_SOURCE_ID "2009-10-14 11:33:55 c1d499afc50d54b376945b4efb65c56c787a073d"
125	125
126	126	/*
127	127	** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
128	128	** KEYWORDS: sqlite3_version
129	129	**
130	130

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -119,11 +119,11 @@
119	**
120	** Requirements: [H10011] [H10014]
121	*/
122	#define SQLITE_VERSION "3.6.19"
123	#define SQLITE_VERSION_NUMBER 3006019
124	#define SQLITE_SOURCE_ID "2009-10-13 15:42:49 f894ebf86d6bafcd1461f104f5f677b3b6a3aa1a"
125
126	/*
127	** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
128	** KEYWORDS: sqlite3_version
129	**
130

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -119,11 +119,11 @@
119	**
120	** Requirements: [H10011] [H10014]
121	*/
122	#define SQLITE_VERSION "3.6.19"
123	#define SQLITE_VERSION_NUMBER 3006019
124	#define SQLITE_SOURCE_ID "2009-10-14 11:33:55 c1d499afc50d54b376945b4efb65c56c787a073d"
125
126	/*
127	** CAPI3REF: Run-Time Library Version Numbers {H10020} <S60100>
128	** KEYWORDS: sqlite3_version
129	**
130

Fossil SCM

Keyboard Shortcuts