Fossil SCM

Add a separate /docsrch webpage to handle just document search.

drh 2015-02-02 04:13 trunk

Commit 15f0dbd953cf65e2d1817c0e65694de6e50706da

Parent 63c2c732464b765…

3 files changed +37 +1 -2 +1 -2

M src/doc.c

+37

		--- src/doc.c
		+++ src/doc.c
		@@ -775,5 +775,42 @@
775	775	}
776	776	cgi_set_content_type(zMime);
777	777	cgi_set_content(&bgimg);
778	778	g.isConst = 1;
779	779	}
	780	+
	781	+
	782	+/*
	783	+** WEBPAGE: /docsrch
	784	+**
	785	+** Search for documents that match a user-supplied pattern.
	786	+*/
	787	+void doc_search_page(void){
	788	+ const char *zPattern = PD("s","");
	789	+ unsigned srchFlags = 0;
	790	+ const char *zDisable;
	791	+
	792	+ login_check_credentials();
	793	+ srchFlags = search_restrict(SRCH_DOC);
	794	+ if( srchFlags==0 ){
	795	+ zDisable = " disabled";
	796	+ zPattern = "";
	797	+ }else{
	798	+ zDisable = "";
	799	+ zPattern = PD("s","");
	800	+ }
	801	+ style_header("Document Search");
	802	+ @ <form method="GET" action="docsrch"><center>
	803	+ @ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable)>
	804	+ @ <input type="submit" value="Search Docs"%s(zDisable)>
	805	+ if( srchFlags==0 ){
	806	+ @ <p class="generalError">Document search is disabled</p>
	807	+ }
	808	+ @ </center></form>
	809	+ while( fossil_isspace(zPattern[0]) ) zPattern++;
	810	+ if( zPattern[0] ){
	811	+ if( search_run_and_output(zPattern, srchFlags)==0 ){
	812	+ @ <p><i>No matches for: "%h(zPattern)"</i></p>
	813	+ }
	814	+ }
	815	+ style_footer();
	816	+}
780	817

	--- src/doc.c
	+++ src/doc.c
	@@ -775,5 +775,42 @@
775	}
776	cgi_set_content_type(zMime);
777	cgi_set_content(&bgimg);
778	g.isConst = 1;
779	}
780
781
782	/*
783	** WEBPAGE: /docsrch
784	**
785	** Search for documents that match a user-supplied pattern.
786	*/
787	void doc_search_page(void){
788	const char *zPattern = PD("s","");
789	unsigned srchFlags = 0;
790	const char *zDisable;
791
792	login_check_credentials();
793	srchFlags = search_restrict(SRCH_DOC);
794	if( srchFlags==0 ){
795	zDisable = " disabled";
796	zPattern = "";
797	}else{
798	zDisable = "";
799	zPattern = PD("s","");
800	}
801	style_header("Document Search");
802	@ <form method="GET" action="docsrch"><center>
803	@ <input type="text" name="s" size="40" value="%h(zPattern)"%s(zDisable)>
804	@ <input type="submit" value="Search Docs"%s(zDisable)>
805	if( srchFlags==0 ){
806	@ <p class="generalError">Document search is disabled</p>
807	}
808	@ </center></form>
809	while( fossil_isspace(zPattern[0]) ) zPattern++;
810	if( zPattern[0] ){
811	if( search_run_and_output(zPattern, srchFlags)==0 ){
812	@ <p><i>No matches for: "%h(zPattern)"</i></p>
813	}
814	}
815	style_footer();
816	}
817

M www/mkindex.tcl

+1 -2

		--- www/mkindex.tcl
		+++ www/mkindex.tcl
		@@ -83,13 +83,12 @@
83	83	fconfigure $out -encoding utf-8 -translation lf
84	84	puts $out \
85	85	"<div class='fossil-doc' data-title='Index Of Fossil Documentation'>"
86	86	puts $out {
87	87	<center>
88		-<form action='../../../search' method='GET'>
	88	+<form action='../../../docsrch' method='GET'>
89	89	<input type="text" name="s" size="40">
90		-<input type="hidden" name="only" value="d">
91	90	<input type="submit" value="Search Docs">
92	91	</form>
93	92	</center>
94	93	<h2>Primary Documents:</h2>
95	94	<ul>
96	95

	--- www/mkindex.tcl
	+++ www/mkindex.tcl
	@@ -83,13 +83,12 @@
83	fconfigure $out -encoding utf-8 -translation lf
84	puts $out \
85	"<div class='fossil-doc' data-title='Index Of Fossil Documentation'>"
86	puts $out {
87	<center>
88	<form action='../../../search' method='GET'>
89	<input type="text" name="s" size="40">
90	<input type="hidden" name="only" value="d">
91	<input type="submit" value="Search Docs">
92	</form>
93	</center>
94	<h2>Primary Documents:</h2>
95	<ul>
96

	--- www/mkindex.tcl
	+++ www/mkindex.tcl
	@@ -83,13 +83,12 @@
83	fconfigure $out -encoding utf-8 -translation lf
84	puts $out \
85	"<div class='fossil-doc' data-title='Index Of Fossil Documentation'>"
86	puts $out {
87	<center>
88	<form action='../../../docsrch' method='GET'>
89	<input type="text" name="s" size="40">

90	<input type="submit" value="Search Docs">
91	</form>
92	</center>
93	<h2>Primary Documents:</h2>
94	<ul>
95

M www/permutedindex.html

+1 -2

		--- www/permutedindex.html
		+++ www/permutedindex.html
		@@ -1,11 +1,10 @@
1	1	<div class='fossil-doc' data-title='Index Of Fossil Documentation'>
2	2
3	3	<center>
4		-<form action='../../../search' method='GET'>
	4	+<form action='../../../docsrch' method='GET'>
5	5	<input type="text" name="s" size="40">
6		-<input type="hidden" name="only" value="d">
7	6	<input type="submit" value="Search Docs">
8	7	</form>
9	8	</center>
10	9	<h2>Primary Documents:</h2>
11	10	<ul>
12	11

	--- www/permutedindex.html
	+++ www/permutedindex.html
	@@ -1,11 +1,10 @@
1	<div class='fossil-doc' data-title='Index Of Fossil Documentation'>
2
3	<center>
4	<form action='../../../search' method='GET'>
5	<input type="text" name="s" size="40">
6	<input type="hidden" name="only" value="d">
7	<input type="submit" value="Search Docs">
8	</form>
9	</center>
10	<h2>Primary Documents:</h2>
11	<ul>
12

	--- www/permutedindex.html
	+++ www/permutedindex.html
	@@ -1,11 +1,10 @@
1	<div class='fossil-doc' data-title='Index Of Fossil Documentation'>
2
3	<center>
4	<form action='../../../docsrch' method='GET'>
5	<input type="text" name="s" size="40">

6	<input type="submit" value="Search Docs">
7	</form>
8	</center>
9	<h2>Primary Documents:</h2>
10	<ul>
11