Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add the search input text box to the menu bar. The search box is only added if the SEARCH file is present in the build directory when "make all" is run. Updates to the search results display page. |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
7f31aaf373237453b5cc7083ecd9ed2d |
| User & Date: | drh 2010-01-08 15:17:29 |
Context
|
2010-01-08
| ||
| 15:38 | Add a tag missing from documentation headers built when search is not enabled. check-in: 42ce6e37be user: dan tags: trunk | |
| 15:17 | Add the search input text box to the menu bar. The search box is only added if the SEARCH file is present in the build directory when "make all" is run. Updates to the search results display page. check-in: 7f31aaf373 user: drh tags: trunk | |
| 00:31 | Update the makefiles so that the TCL extensions used to build the FTS3 tables for the search function are built using STUBS. check-in: 17ee5a34e9 user: drh tags: trunk | |
Changes
Changes to matrix.tcl.
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
...
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
|
font-style:italic;
width:240px;
margin:12px;
margin-top:58px;
}
.toolbar {
font-variant: small-caps;
text-align: center;
line-height: 1.6em;
margin: 0;
padding:1px 8px;
}
.toolbar a { color: white; text-decoration: none; padding: 6px 12px; }
.toolbar a:visited { color: white; }
.toolbar a:hover { color: #80a796; background: white; }
.content { margin: 5%; }
.content dt { font-weight:bold; }
................................................................................
<a href="${path}about.html">About</a>
<a href="${path}sitemap.html">Sitemap</a>
<a href="${path}docs.html">Documentation</a>
<a href="${path}download.html">Download</a>
<a href="${path}copyright.html">License</a>
<a href="${path}news.html">News</a>
<a href="${path}support.html">Support</a>
<a href="http://www.sqlite.org/search">Search</a>
</div></div></div></div></div>
</td></tr></table>
}
}
# End of code copied out of wrap.tcl
##############################################################################
|
<
|
<
|
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
...
251
252
253
254
255
256
257
258
259
260
261
262
263
264
|
font-style:italic;
width:240px;
margin:12px;
margin-top:58px;
}
.toolbar {
text-align: center;
line-height: 1.6em;
margin: 0;
padding: 0px 8px;
}
.toolbar a { color: white; text-decoration: none; padding: 6px 12px; }
.toolbar a:visited { color: white; }
.toolbar a:hover { color: #80a796; background: white; }
.content { margin: 5%; }
.content dt { font-weight:bold; }
................................................................................
<a href="${path}about.html">About</a>
<a href="${path}sitemap.html">Sitemap</a>
<a href="${path}docs.html">Documentation</a>
<a href="${path}download.html">Download</a>
<a href="${path}copyright.html">License</a>
<a href="${path}news.html">News</a>
<a href="${path}support.html">Support</a>
</div></div></div></div></div>
</td></tr></table>
}
}
# End of code copied out of wrap.tcl
##############################################################################
|
Changes to search/search.tcl.
101 102 103 104 105 106 107 108 109 110 111 112 113 114 ... 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 ... 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 ... 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 ... 362 363 364 365 366 367 368 369 370 371 372 373 374 375 |
append ret "<tr><td>[htmlize $key]<td>[htmlize $value]"
}
append ret "</table>"
return $ret
}
proc searchform {} {
set initial "Enter search term:"
catch { set initial $::A(q) }
return [subst {
<table style="margin: 1em auto"> <tr><td>Search SQLite docs for:<td>
<form name=f method=GET action=search>
<input name=q type=text width=35 value="[attrize $initial]"></input>
<input name=s type=submit value="Search"></input>
................................................................................
}
proc footer {} {
return {
<hr>
<table align=right>
<td>
<i>Powered by SQLite/FTS3.</i>
</table>
}
}
#-------------------------------------------------------------------------
# This command is similar to the builtin Tcl [time] command, except that
................................................................................
font-style:italic;
width:300px;
margin:12px;
margin-top:58px;
}
.toolbar {
font-variant: small-caps;
text-align: center;
line-height: 1.6em;
margin: 0;
padding:1px 8px;
}
.toolbar a { color: white;
text-decoration: none; padding: 6px
12px; }
.toolbar a:visited { color: white; }
.toolbar a:hover { color: #80a796;
background: white; }
................................................................................
<a href="index.html">
<img class="logo" src="images/SQLite.gif" alt="SQLite Logo" border="0"></a>
<div><!-- IE hack to prevent disappearing logo--></div>
<div class="tagline">Small. Fast. Reliable.<br>Choose any three.</div>
<table width=100% style="clear:both"><tr><td>
<div class="se"><div class="sw"><div class="ne"><div class="nw">
<div class="toolbar">
<a href="about.html">About</a>
<a href="sitemap.html">Sitemap</a>
<a href="docs.html">Documentation</a>
<a href="download.html">Download</a>
<a href="copyright.html">License</a>
<a href="news.html">News</a>
<a href="support.html">Support</a>
<a href="http://www.sqlite.org/search">Search</a>
</div></div></div></div></div>
</td></tr></table>
}
if {![info exists env(REQUEST_METHOD)]} {
set env(REQUEST_METHOD) GET
set env(QUERY_STRING) rebuild=1
set ::HEADER ""
................................................................................
set ::HEADER ""
}
set TITLE "Search SQLite Documentation"
if {0==[catch main res]} {
set document [subst -nocommands $::HEADER]
append document $res
} else {
set document "<pre>"
append document "Error: $res\n\n"
append document $::errorInfo
append document "</pre>"
|
> | < | > > | | | | | < | | | > > > | > > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > |
101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 ... 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 ... 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 ... 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 ... 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 |
append ret "<tr><td>[htmlize $key]<td>[htmlize $value]"
}
append ret "</table>"
return $ret
}
proc searchform {} {
return {}
set initial "Enter search term:"
catch { set initial $::A(q) }
return [subst {
<table style="margin: 1em auto"> <tr><td>Search SQLite docs for:<td>
<form name=f method=GET action=search>
<input name=q type=text width=35 value="[attrize $initial]"></input>
<input name=s type=submit value="Search"></input>
................................................................................
}
proc footer {} {
return {
<hr>
<table align=right>
<td>
<i>Powered by <a href="http://www.sqlite.org/fts3.html">FTS3</a>.</i>
</table>
}
}
#-------------------------------------------------------------------------
# This command is similar to the builtin Tcl [time] command, except that
................................................................................
font-style:italic;
width:300px;
margin:12px;
margin-top:58px;
}
.toolbar {
text-align: center;
line-height: 1.6em;
margin: 0;
padding: 0px 8px;
}
.toolbar a { color: white;
text-decoration: none; padding: 6px
12px; }
.toolbar a:visited { color: white; }
.toolbar a:hover { color: #80a796;
background: white; }
................................................................................
<a href="index.html">
<img class="logo" src="images/SQLite.gif" alt="SQLite Logo" border="0"></a>
<div><!-- IE hack to prevent disappearing logo--></div>
<div class="tagline">Small. Fast. Reliable.<br>Choose any three.</div>
<table width=100% style="clear:both"><tr><td>
<div class="se"><div class="sw"><div class="ne"><div class="nw">
<table width=100% style="padding:0;margin:0;cell-spacing:0"><tr>
<td width=100%>
<div class="toolbar">
<a href="about.html">About</a>
<a href="sitemap.html">Sitemap</a>
<a href="docs.html">Documentation</a>
<a href="download.html">Download</a>
<a href="copyright.html">License</a>
<a href="news.html">News</a>
<a href="support.html">Support</a>
</div>
<td>
<div style="padding:0 1em 0px 0;white-space:nowrap">
<form name=f method="GET" action="http://www.sqlite.org/search">
<input id=q name=q type=text value=""
onfocus="entersearch()" onblur="leavesearch()" style="width:24ex;padding:1px 1ex; border:solid white 1px; font-size:0.9em">
<input name=s type=submit value="Go" style="border:solid white 1px;background-color:#80a796;color:white;font-size:0.9em;padding:0 1ex">
</form>
</div>
</table>
</div></div></div></div>
</td></tr></table>
<script>
gMsg = "Search SQLite Docs..."
function entersearch() {
var q = document.getElementById("q");
if( q.value == gMsg ) { q.value = "" }
q.style.color = "black"
q.style.fontStyle = "normal"
}
function leavesearch() {
var q = document.getElementById("q");
if( q.value == "" ) {
q.value = gMsg
q.style.color = "#80a796"
q.style.fontStyle = "italic"
}
}
function initsearch() {
var q = document.getElementById("q");
q.value = ""
q.value = $::INITSEARCH
q.style.color = "black"
q.style.fontStyle = "normal"
}
window.onload = initsearch
</script>
}
if {![info exists env(REQUEST_METHOD)]} {
set env(REQUEST_METHOD) GET
set env(QUERY_STRING) rebuild=1
set ::HEADER ""
................................................................................
set ::HEADER ""
}
set TITLE "Search SQLite Documentation"
if {0==[catch main res]} {
set ::INITSEARCH \"[attrize $::A(q)]\"
set document [subst -nocommands $::HEADER]
append document $res
} else {
set document "<pre>"
append document "Error: $res\n\n"
append document $::errorInfo
append document "</pre>"
|
Changes to wrap.tcl.
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
...
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
|
font-style:italic;
width:300px;
margin:12px;
margin-top:58px;
}
.toolbar {
font-variant: small-caps;
text-align: center;
line-height: 1.6em;
margin: 0;
padding:1px 8px;
}
.toolbar a { color: white; text-decoration: none; padding: 6px 12px; }
.toolbar a:visited { color: white; }
.toolbar a:hover { color: #80a796; background: white; }
.content { margin: 5%; }
.content dt { font-weight:bold; }
................................................................................
<img class="logo" src="${path}images/SQLite.gif" alt="SQLite Logo"
border="0"></a>
<div><!-- IE hack to prevent disappearing logo--></div>
<div class="tagline">${tagline}</div>
<table width=100% style="clear:both"><tr><td>
<div class="se"><div class="sw"><div class="ne"><div class="nw">
<div class="toolbar">
<a href="${path}about.html">About</a>
<a href="${path}sitemap.html">Sitemap</a>
<a href="${path}docs.html">Documentation</a>
<a href="${path}download.html">Download</a>
<a href="${path}copyright.html">License</a>
<a href="${path}news.html">News</a>
<a href="${path}support.html">Support</a>
<a href="http://www.sqlite.org/search">Search</a>
</div></div></div></div></div>
</td></tr></table>
}
if {$srcfile!=""} {
if {[file exists DRAFT]} {
set hd(footer) {
<p align="center"><font size="6" color="red">*** DRAFT ***</font></p>
}
} else {
|
<
|
>
>
>
>
>
>
|
>
>
>
>
>
>
>
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
...
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
|
font-style:italic;
width:300px;
margin:12px;
margin-top:58px;
}
.toolbar {
text-align: center;
line-height: 1.6em;
margin: 0;
padding: 0px 8px;
}
.toolbar a { color: white; text-decoration: none; padding: 6px 12px; }
.toolbar a:visited { color: white; }
.toolbar a:hover { color: #80a796; background: white; }
.content { margin: 5%; }
.content dt { font-weight:bold; }
................................................................................
<img class="logo" src="${path}images/SQLite.gif" alt="SQLite Logo"
border="0"></a>
<div><!-- IE hack to prevent disappearing logo--></div>
<div class="tagline">${tagline}</div>
<table width=100% style="clear:both"><tr><td>
<div class="se"><div class="sw"><div class="ne"><div class="nw">
<table width=100% style="padding:0;margin:0;cell-spacing:0"><tr>
<td width=100%>
<div class="toolbar">
<a href="${path}about.html">About</a>
<a href="${path}sitemap.html">Sitemap</a>
<a href="${path}docs.html">Documentation</a>
<a href="${path}download.html">Download</a>
<a href="${path}copyright.html">License</a>
<a href="${path}news.html">News</a>
<a href="${path}support.html">Support</a>
</div>}
if {[file exists SEARCH]} {
putsin4 $fd {<td>
<div style="padding:0 1em 0px 0;white-space:nowrap">
<form name=f method="GET" action="http://www.sqlite.org/search">
<input id=q name=q type=text value=""
onfocus="entersearch()" onblur="leavesearch()" style="width:24ex;padding:1px 1ex; border:solid white 1px; font-size:0.9em">
<input name=s type=submit value="Go" style="border:solid white 1px;background-color:#80a796;color:white;font-size:0.9em;padding:0 1ex">
</form>
</div>
</table>}
}
putsin4 $fd {</div></div></div></div>
</td></tr></table>
}
if {[file exists SEARCH]} {
putsin4 $fd {<script>
gMsg = "Search SQLite Docs..."
function entersearch() {
var q = document.getElementById("q");
if( q.value == gMsg ) { q.value = "" }
q.style.color = "black"
q.style.fontStyle = "normal"
}
function leavesearch() {
var q = document.getElementById("q");
if( q.value == "" ) {
q.value = gMsg
q.style.color = "#80a796"
q.style.fontStyle = "italic"
}
}
function initsearch() {
var q = document.getElementById("q");
q.value = ""
q.value = gMsg
q.style.color = "#80a796"
q.style.fontStyle = "italic"
}
window.onload = initsearch
</script>}
}
if {$srcfile!=""} {
if {[file exists DRAFT]} {
set hd(footer) {
<p align="center"><font size="6" color="red">*** DRAFT ***</font></p>
}
} else {
|