Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/search.info	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!-- Generated by the ACS Package Manager -->
+
+<package key="search" url="http://www.arsdigita.com/acs-repository/apm/packages/search" type="apm_application">
+    <package-name>Search</package-name>
+    <pretty-plural>Search</pretty-plural>
+    <initial-install-p>t</initial-install-p>
+    <singleton-p>f</singleton-p>
+
+    <version name="4.2" url="http://www.arsdigita.com/acs-repository/download/apm/search-4.2.apm">
+    <database-support>
+        <database>oracle</database>
+        <database>postgresql</database>
+    </database-support>
+        <owner url="mailto:k2pts@yahoo.com">Neophytos Demetriou</owner>
+
+        <!-- No dependency information -->
+
+        <files>
+            <file type="package_spec" path="search.info"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/notes-bindings-create.sql"/>
+            <file type="data_model" db_type="postgresql" path="sql/postgresql/notes-bindings-drop.sql"/>
+            <file type="data_model_create" db_type="postgresql" path="sql/postgresql/search-create.sql"/>
+            <file type="tcl_init" path="tcl/search-init.tcl"/>
+            <file type="tcl_procs" path="tcl/search-procs.tcl"/>
+            <file type="tcl_util" path="www/search.tcl"/>
+        </files>
+        <parameters>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="LimitDefault"  default="10" description="Default limit value"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SearchTheWeb"  default="http://av.com/sites/search/web?q=%s AltaVista http://search.excite.com/search.gw?s=%s Excite http://www.google.com/search?q=%s Google http://hotbot.com/?MT=%s HotBot http://lycos.com/cgi-bin/pursuit?query=%s Lycos http://search.yahoo.com/search?p=%s Yahoo!" description="Search the Web (e.g. Google)"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SearchIndexerInterval"  default="30" description="SearchIndexerInterval"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="FtsEngineDriver"  default="openfts-driver" description="Which search engine driver to use? You should enter the name of the related binding (e.g. openfts-driver, swish-driver,...)"/>
+        </parameters>
+
+    </version>
+</package>
Index: openacs-4/packages/search/sql/postgresql/search-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-create.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/sql/postgresql/search-create.sql	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,3 @@
+\i search-tables-create.sql
+\i search-packages-create.sql
+\i search-sc-create.sql
Index: openacs-4/packages/search/sql/postgresql/search-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-drop.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/sql/postgresql/search-drop.sql	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,3 @@
+\i search-sc-drop.sql
+\i search-packages-drop.sql
+\i search-tables-drop.sql
\ No newline at end of file
Index: openacs-4/packages/search/sql/postgresql/search-packages-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-packages-create.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/sql/postgresql/search-packages-create.sql	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,39 @@
+--
+-- Search Observer
+--
+
+create function search_observer__enqueue(integer,varchar)
+returns integer as '
+declare
+    p_object_id			alias for $1;
+    p_event			alias for $2;
+begin
+    insert into search_observer_queue (
+	object_id,
+	event
+    ) values (
+        p_object_id,
+	p_event
+    );
+
+    return 0;
+
+end;' language 'plpgsql';
+
+
+create function search_observer__dequeue(integer,timestamp,varchar)
+returns integer as '
+declare
+    p_object_id			alias for $1;
+    p_date			alias for $2;
+    p_event			alias for $3;
+begin
+
+    delete from search_observer_queue 
+    where object_id = p_object_id 
+    and date =p_date
+    and event = p_event;
+
+    return 0;
+
+end;' language 'plpgsql';
Index: openacs-4/packages/search/sql/postgresql/search-packages-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-packages-drop.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/sql/postgresql/search-packages-drop.sql	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,2 @@
+drop function search_observer__dequeue(integer,timestamp,varchar);
+drop function search_observer__enqueue(integer,varchar);
Index: openacs-4/packages/search/sql/postgresql/search-sc-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-sc-create.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/sql/postgresql/search-sc-create.sql	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,182 @@
+--
+-- ACS-SC Contract: FtsEngineDriver
+--
+
+select acs_sc_contract__new (
+           'FtsEngineDriver',			-- contract_name
+	   'Full Text Search Engine Driver'	-- contract_desc
+);
+
+
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.Search.InputType',
+	   'query:string,offset:integer,limit:integer'
+);
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.Search.OutputType',
+	   'ids:integer[],stopwords:string[]'
+);
+select acs_sc_operation__new (
+           'FtsEngineDriver',			-- contract_name
+           'search',				-- operation_name
+	   'Search',                		-- operation_desc
+	   'f',					-- operation_iscachable_p
+	   3,					-- operation_nargs
+	   'FtsEngineDriver.Search.InputType',	-- operation_inputtype
+	   'FtsEngineDriver.Search.OutputType'	-- operation_outputtype
+);
+
+
+
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.Index.InputType',
+	   'object_id:integer,txt:string,title:string,keywords:string'
+);
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.Index.OutputType',
+	   ''
+);
+select acs_sc_operation__new (
+           'FtsEngineDriver',			-- contract_name
+           'index', 				-- operation_name
+	   'Index',                 		-- operation_desc
+	   'f',					-- operation_iscachable_p
+	   3,					-- operation_nargs
+	   'FtsEngineDriver.Index.InputType',	-- operation_inputtype
+	   'FtsEngineDriver.Index.OutputType'	-- operation_outputtype
+);
+
+
+
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.Unindex.InputType',
+	   'object_id:integer'
+);
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.Unindex.OutputType',
+	   ''
+);
+select acs_sc_operation__new (
+           'FtsEngineDriver',			-- contract_name
+           'unindex',				-- operation_name
+	   'Unindex',               		-- operation_desc
+	   'f',					-- operation_iscachable_p
+	   1,					-- operation_nargs
+	   'FtsEngineDriver.Unindex.InputType',	-- operation_inputtype
+	   'FtsEngineDriver.Unindex.OutputType'	-- operation_outputtype
+);
+
+
+
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.UpdateIndex.InputType',
+	   'object_id:integer,txt:string,title:string,keywords:string'
+);
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.UpdateIndex.OutputType',
+	   ''
+);
+select acs_sc_operation__new (
+           'FtsEngineDriver',			-- contract_name
+           'update_index',			-- operation_name
+	   'Update Index',             		-- operation_desc
+	   'f',					-- operation_iscachable_p
+	   3,					-- operation_nargs
+	   'FtsEngineDriver.UpdateIndex.InputType',	-- operation_inputtype
+	   'FtsEngineDriver.UpdateIndex.OutputType'	-- operation_outputtype
+);
+
+
+
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.Summary.InputType',
+	   'query:string,txt:string'
+);
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.Summary.OutputType',
+	   'summary:string'
+);
+select acs_sc_operation__new (
+           'FtsEngineDriver',			-- contract_name
+           'summary',				-- operation_name
+	   'Summary',               		-- operation_desc
+	   'f',					-- operation_iscachable_p
+	   2,					-- operation_nargs
+	   'FtsEngineDriver.Summary.InputType',	-- operation_inputtype
+	   'FtsEngineDriver.Summary.OutputType'	-- operation_outputtype
+);
+
+
+
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.Info.InputType',
+	   ''
+);
+select acs_sc_msg_type__new (
+           'FtsEngineDriver.Info.OutputType',
+	   'package_key:string,version:version,automatic_and_queries_p:boolean,stopwords_p:boolean'
+);
+select acs_sc_operation__new (
+           'FtsEngineDriver',				-- contract_name
+           'info',					-- operation_name
+	   'Information about the driver',		-- operation_desc
+	   'f',						-- operation_iscachable_p
+	   1,						-- operation_nargs
+	   'FtsEngineDriver.Info.InputType',		-- operation_inputtype
+	   'FtsEngineDriver.Info.OutputType'		-- operation_outputtype
+);
+
+
+
+
+--
+-- ACS-SC Contract: FtsContentProvider
+--
+
+select acs_sc_contract__new (
+           'FtsContentProvider',			-- contract_name
+	   'Full Text Search Content Provider'		-- contract_desc
+);
+
+select acs_sc_msg_type__new (
+           'FtsContentProvider.Datasource.InputType',
+	   'object_id:integer'
+);
+select acs_sc_msg_type__new (
+           'FtsContentProvider.Datasource.OutputType',
+	   'object_id:integer,title:string,content:string,mime:string,storage:string'
+);
+select acs_sc_operation__new (
+           'FtsContentProvider',			-- contract_name
+           'datasource',				-- operation_name
+	   'Data Source',				-- operation_desc
+	   'f',						-- operation_iscachable_p
+	   1,						-- operation_nargs
+	   'FtsContentProvider.Datasource.InputType',	-- operation_inputtype
+	   'FtsContentProvider.Datasource.OutputType'	-- operation_outputtype
+);
+
+
+
+select acs_sc_msg_type__new (
+           'FtsContentProvider.Url.InputType',
+	   'object_id:integer'
+);
+select acs_sc_msg_type__new (
+           'FtsContentProvider.Url.OutputType',
+	   'url:uri'
+);
+select acs_sc_operation__new (
+           'FtsContentProvider',			-- contract_name
+           'url',					-- operation_name
+	   'URL',					-- operation_desc
+	   'f',						-- operation_iscachable_p
+	   1,						-- operation_nargs
+	   'FtsContentProvider.Url.InputType',		-- operation_inputtype
+	   'FtsContentProvider.Url.OutputType'		-- operation_outputtype
+);
+
+
+
+
+
Index: openacs-4/packages/search/sql/postgresql/search-sc-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-sc-drop.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/sql/postgresql/search-sc-drop.sql	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,20 @@
+select acs_sc_contract__delete('FtsContentProvider');
+select acs_sc_msg_type__delete ('FtsContentProvider.Datasource.InputType');
+select acs_sc_msg_type__delete ('FtsContentProvider.Datasource.OutputType');
+
+
+
+select acs_sc_contract__delete('FtsEngineDriver');
+select acs_sc_msg_type__delete ('FtsEngineDriver.Search.InputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.Search.OutputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.Index.InputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.Index.OutputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.Unindex.InputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.Unindex.OutputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.UpdateIndex.InputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.UpdateIndex.OutputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.Summary.InputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.Summary.OutputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.Info.InputType');
+select acs_sc_msg_type__delete ('FtsEngineDriver.Info.OutputType');
+
Index: openacs-4/packages/search/sql/postgresql/search-tables-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-tables-create.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/sql/postgresql/search-tables-create.sql	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,10 @@
+create table search_observer_queue (
+    object_id		   integer
+			   constraint search_observer_queue_object_id_fk 
+			   references acs_objects(object_id),
+    date		   timestamp default now(),
+    event		   varchar(6)
+			   constraint search_observer_queue_event_ck
+			   check (event in ('INSERT','DELETE','UPDATE')),
+    constraint search_observer_queue_oid_date_un unique(object_id,date)   
+);
Index: openacs-4/packages/search/sql/postgresql/search-tables-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/sql/postgresql/search-tables-drop.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/sql/postgresql/search-tables-drop.sql	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1 @@
+drop table search_observer_queue;
Index: openacs-4/packages/search/tcl/search-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-init.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/tcl/search-init.tcl	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,2 @@
+ad_schedule_proc [ad_parameter -package_id [apm_package_id_from_key search] SearchIndexerInterval] search_indexer
+
Index: openacs-4/packages/search/tcl/search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-procs.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/tcl/search-procs.tcl	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,126 @@
+ad_proc search_indexer {} {
+    @author Neophytos Demetriou
+} {
+
+    set driver [ad_parameter -package_id [apm_package_id_from_key search] FtsEngineDriver]
+
+    db_foreach search_observer_queue_entry {
+	select object_id, date, event
+	from search_observer_queue
+	order by date asc
+    } {
+	
+	switch $event {
+	    INSERT {
+		set object_type [db_exec_plsql get_object_type "select acs_object_util__get_object_type($object_id)"]
+		array set datasource [acs_sc_call FtsContentProvider datasource [list $object_id] $object_type]
+		set txt [search_content_filter $datasource(content) $datasource(mime) $datasource(storage)]
+		acs_sc_call FtsEngineDriver index [list $datasource(object_id) $txt $datasource(title) $datasource(keywords)] $driver
+	    } 
+	    DELETE {
+		acs_sc_call FtsEngineDriver unindex [list $object_id] $driver
+	    } 
+	    UPDATE {
+		set object_type [db_exec_plsql get_object_type "select acs_object_util__get_object_type($object_id)"]
+		array set datasource [acs_sc_call FtsContentProvider datasource [list $object_id] $object_type] 
+		set txt [search_content_filter $datasource(content) $datasource(mime) $datasource(storage)]
+		if { $txt != "" } {
+		    acs_sc_call FtsEngineDriver update_index [list $datasource(object_id) $txt $datasource(title) $datasource(keywords)] $driver
+		}
+	    }
+	}
+
+	db_exec_plsql search_observer_dequeue_entry {
+	    select search_observer__dequeue(
+	        :object_id,
+	        :date,
+	        :event
+	    );
+	}
+    }
+}
+
+
+
+ad_proc search_content_filter {
+    content
+    mime
+    storage
+} {
+    @author Neophytos Demetriou
+} {
+    switch $mime {
+	{text/plain} {
+	    return $content 
+	}
+	{text/html} {
+	    return $content
+	}
+    }
+    return
+}
+
+
+ad_proc search_content_get {
+    content
+    mime
+    storage
+} {
+    @author Neophytos Demetriou
+
+    @param content 
+    holds the filename if storage=file
+    holds the text data if storage=text
+    holds the lob_id if storage=lob
+} {
+    switch $storage {
+	text {
+	    return $content
+	}
+	file {
+	    if {[file exists $content]} {
+		set ofp [open $content r]
+		set txt [read $ofp]
+		close $ofp
+	    } else {
+		error "file: $content doesn't exist"
+	    }
+	    return [DoubleApos $txt]
+	}
+	lob {
+	    return $txt
+	}
+    }
+    return
+}
+
+
+
+ad_proc search_choice_bar { items links values {default ""} } {
+    @author Neophytos Demetriou
+} {
+
+    set count 0
+    set return_list [list]
+
+    foreach value $values {
+        if { [string compare $default $value] == 0 } {
+                lappend return_list "<font color=a90a08><strong>[lindex $items $count]</strong></font>"
+        } else {
+                lappend return_list "<a href=\"[lindex $links $count]\"><font color=000000>[lindex $items $count]</font></a>"
+        }
+
+        incr count
+    }
+
+    if { [llength $return_list] > 0 } {
+        return "[join $return_list " "]"
+    } else {
+        return ""
+    }
+    
+}
+
+
+
+
Index: openacs-4/packages/search/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/index.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/www/index.adp	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,13 @@
+<master>
+<h2>Search</h2>
+@context_bar@
+<hr>
+
+<table width="100%"><tr><td nowrap>
+<form method=GET action=search>
+<center><small>
+<input type=text name=q size=31 maxlength=256>
+<input type=submit value=Search>
+</small></center>
+</form>
+</td></tr></table>
\ No newline at end of file
Index: openacs-4/packages/search/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/Attic/index.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/www/index.tcl	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,2 @@
+set context_bar [ad_context_bar]
+ad_return_template
\ No newline at end of file
Index: openacs-4/packages/search/www/search-results-bottom.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/Attic/search-results-bottom.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/www/search-results-bottom.adp	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,39 @@
+<if @from_result_page@ lt @to_result_page@>
+  <center>
+
+    <small>Result page:</small>
+
+    <if @from_result_page@ lt @current_result_page@>
+      <small><a href=search?q=@urlencoded_query@<if @offset_previous@ ne 0>&offset=@offset_previous@</if>><font color=0000cc><b>Previous</b></font></a></small>
+    </if>
+    &nbsp;@choice_bar@&nbsp;
+    
+    <if @current_result_page@ lt @to_result_page@>
+	<small><a href=search?q=@urlencoded_query@&offset=@offset_next@><font color=0000cc><b>Next</b></font></a></small>
+    </if>
+  </center>
+</if>
+<if @count@ gt 0>
+  <center>
+    <table border=0 cellpadding=3 cellspacing=0>
+      <tr><td nowrap>
+        <form method=GET action=search>
+          <center>
+            <small>
+              <input type=text name=q size=31 maxlength=256 value="@query@">
+              <input type=submit value=Search>
+            </small>
+          </center>
+        </form>
+      </td></tr>
+    </table>
+  </center>
+
+  <if @stw@ not nil>
+    <center>
+      <font size=-1>Try your query on: @stw@</font></center>
+    </center>
+  </if>
+</if>
+</body>
+</html>
\ No newline at end of file
Index: openacs-4/packages/search/www/search-results-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/Attic/search-results-one.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/www/search-results-one.adp	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,12 @@
+<if @title_summary@ nil>
+  <a href=@url@>Untitled</a><br>
+</if>
+<else>
+  <a href=@url@>@title_summary@</a><br>
+</else>
+<if @txt_summary@ nil>
+</if>
+<else>
+@txt_summary@<br>
+</else>
+<font color=green>@url@</font><br><br>
\ No newline at end of file
Index: openacs-4/packages/search/www/search-results-top.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/Attic/search-results-top.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/www/search-results-top.adp	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,80 @@
+<html>
+<head>
+   <title>@title@</title>
+</head>
+<body bgcolor=ffffff text=000000 >
+<h2>@title@</h2>
+@context_bar@
+
+<table border=0 cellpadding=3 cellspacing=0 leftmargin=15 topmargin=5 marginwidth=15 marginheight=5>
+  <tr><td nowrap>
+    <form method=GET action=search>
+      <small>
+        <input type=text name=q size=31 maxlength=256 value="@query@">
+        <input type=submit value=Search>
+      </small>
+    </form>
+  </td></tr>
+<if @and_queries_notice_p@ eq 1>
+  <tr><td>
+    <small>
+      <font color=6f6f6f>
+        The "<b>AND</b>" operator is unnecessary -- we include all search terms by default. 
+        [<a href=help/basics#and>details</a>]
+      </font>
+    </small>
+  </td></tr>
+</if>
+<if @nstopwords@ eq 1>
+  <tr><td>
+    <small>
+      <font color=6f6f6f>
+        "<b>@stopwords@</b>" is a very common word and was not included in your search.
+        [<a href=help/basics#stopwords>details</a>]
+      </font>
+    </small>
+  </td></tr>
+</if>
+<if @nstopwords@ gt 1>
+  <tr><td>
+    <small>
+      <font color=6f6f6f>
+        The following words are very common and were not included in your search: <b>@stopwords@</b>.
+        [<a href=help/basics#stopwords>details</a>]
+      </font>
+    </small>
+  </td></tr>
+</if>
+</table>
+
+<if @count@ eq 0>
+  <br><br>Your search - <b>@query@</b> - did not match any documents.
+  <br>No pages were found containing "<b>@query@</b>".
+  <br><br>Suggestions:
+  <ul>
+    <li>Make sure all words are spelled correctly.
+    <li>Try different keywords.
+    <li>Try more general keywords.
+    <if @nquery@ gt 2>
+      <li>Try fewer keywords.
+    </if>
+  </ul>
+</if>
+<else>
+  <br>
+  <table width=100% bgcolor=3366cc border=0 cellpadding=3 cellspacing=0>
+    <tr><td>
+      <font color=white>
+        Searched for: @query@
+      </font>
+    </td><td align=right>
+      <font color=white>
+        Results <b>@low@-@high@</b> of about <b>@count@</b>.
+        Search took <b>@elapsed@</b> seconds. 
+      </font>     
+    </td></tr>
+  </table>
+  <br clear=all>
+</else>
+
+<slave>
\ No newline at end of file
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/www/search.tcl	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,128 @@
+ad_page_contract {
+    @author Neophytos Demetriou <k2pts@cytanet.com.cy>
+    @creation-date September 01, 2001
+    @cvs-id $Id: search.tcl,v 1.1 2001/09/02 18:11:39 neophytosd Exp $
+} {
+    q:notnull,trim
+    {offset 0}
+} -errors {
+    q:notnull {You must specify some keywords.}
+}
+
+ns_startcontent -type "text/html"
+set this_dir [file dirname [ad_conn file]]
+set template_top_file "$this_dir/search-results-top"
+set template_one_file "$this_dir/search-results-one"
+set template_bottom_file "$this_dir/search-results-bottom"
+
+
+set package_id [ad_conn package_id]
+set driver [ad_parameter -package_id $package_id FtsEngineDriver]
+array set info [acs_sc_call FtsEngineDriver info [list] $driver]
+set limit [ad_parameter -package_id $package_id LimitDefault]
+
+set title "Search Results"
+set context_bar [ad_context_bar {Search Results}]
+
+set q [string tolower $q]
+if { $offset < 0 } { set offset 0 }
+set t0 [clock clicks -milliseconds]
+array set result [acs_sc_call FtsEngineDriver search [list $q $offset $limit] $driver]
+set tend [clock clicks -milliseconds]
+set elapsed [format "%.02f" [expr double(abs($tend - $t0)) / 1000.0]]
+
+if { $offset >= $result(count) } { set offset [expr ($result(count) / $limit) * $limit] }
+
+set low [expr $offset + 1]
+set high [expr $offset + $limit]
+if { $high > $result(count) } { set high $result(count) }
+
+
+if { $info(automatic_and_queries_p) && ([lsearch -exact $q and] > 0) } {
+    set and_queries_notice_p 1
+} else {
+    set and_queries_notice_p 0
+}
+
+set template_top [template::adp_parse $template_top_file [list \
+	title $title \
+	context_bar $context_bar \
+	query $q \
+	nquery [llength $q] \
+	and_queries_notice_p $and_queries_notice_p \
+	stopwords $result(stopwords) \
+	nstopwords [llength $result(stopwords)] \
+	low $low \
+	high $high \
+	count $result(count) \
+	elapsed $elapsed]]
+
+ns_write $template_top
+
+    for { set __i [expr 0] } { $__i < [expr $high - $low +1] } { incr __i } {
+
+	set object_id [lindex $result(ids) $__i]
+	set object_type [db_exec_plsql get_object_type "select acs_object_util__get_object_type($object_id)"]
+	array set datasource [acs_sc_call FtsContentProvider datasource [list $object_id] $object_type]
+
+	set txt [search_content_filter $datasource(content) $datasource(mime) $datasource(storage)]
+	set title_summary [acs_sc_call FtsEngineDriver summary [list $q $datasource(title)] $driver]
+	set txt_summary [acs_sc_call FtsEngineDriver summary [list $q $txt] $driver]
+	set url [acs_sc_call FtsContentProvider url [list $object_id] $object_type]
+
+
+	set template_one [template::adp_parse $template_one_file [list \
+		title_summary $title_summary \
+		txt_summary $txt_summary \
+		url $url]]
+
+	ns_write $template_one
+
+    }
+
+    set urlencoded_query [ad_urlencode $q]
+    set from_result_page 1
+    set current_result_page [expr ($low / $limit) + 1]
+    set to_result_page [expr ($result(count) / $limit) + 1]
+
+    set items [list]
+    set links [list]
+    set values [list]
+    for { set __i $from_result_page } { $__i <= $to_result_page} { incr __i } {
+	lappend items $__i
+	if { $__i == 1 } {
+	    lappend links "search?q=${urlencoded_query}"
+	} else {
+	    lappend links "search?q=${urlencoded_query}&offset=[expr ($__i - 1) * $limit]"
+	}
+	lappend values $__i
+    }
+
+    set search_the_web [ad_parameter -package_id $package_id SearchTheWeb]
+    if [llength $search_the_web] {
+	set stw ""
+	foreach {url site} $search_the_web {
+	    append stw "<a href=[format $url $urlencoded_query]>$site</a> "
+	}
+    }
+
+set template_bottom [template::adp_parse $template_bottom_file [list \
+	query $q \
+	count $result(count) \
+	urlencoded_query $urlencoded_query \
+	from_result_page $from_result_page \
+	current_result_page $current_result_page \
+	to_result_page $to_result_page \
+	offset_previous [expr $offset - $limit] \
+	choice_bar [search_choice_bar $items $links $values $current_result_page] \
+	offset_next [expr $offset + $limit] \
+	stw $stw\
+	  ]]
+
+ns_write $template_bottom
+
+
+
+
+
+
Index: openacs-4/packages/search/www/test.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/test.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/www/test.adp	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1 @@
+<master>
\ No newline at end of file
Index: openacs-4/packages/search/www/help/basics.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/help/basics.html,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/search/www/help/basics.html	2 Sep 2001 18:11:39 -0000	1.1
@@ -0,0 +1,64 @@
+<html>
+
+<head>
+<title>The Basics of Our Search</title>
+</head>
+    
+<body bgcolor=ffffff text=000000>
+<blockquote>
+
+<h2>The Basics of Our Search</h2>
+
+<ul>
+<li> <a href="#basic">Basic search</a> </li>
+<li> <a href="#and">Automatic "and" queries</a> </li>
+<li> <a href="#stopwords"> What is a stop word?</a> </li>
+<li> <a href="#context">See your search terms in context</a> </li>
+<li> <a href="#stemming">Does our search use stemming?</a> </li>
+<li> <a href="#case">Does capitalization matter?</a> </li>
+</ul>
+
+<a name=basic><h3>Basic Search</h3></a>
+<p> To enter a query, just type in a few descriptive words 
+and hit the 'enter' key (or click on the Search button) for a 
+list of relevant pages.</p>
+<p>Our search uses sophisticated text-matching techniques to find pages that 
+are both important and relevant to your search. For instance, when our search 
+analyzes a page, it assigns higher relevance to pages in which 
+your query terms appear near each other. </p>
+
+
+<a name=and><h3>Automatic "and" Queries</h3></a>
+<p> By default, our search only returns pages that include all of your search 
+terms. There is no need to include "and" between terms.
+To restrict a search further, just include more terms. </p>
+
+
+<a name=stopwords><h3>What is a stop word?</h3></a>
+<p> Our search ignores common words and characters (known as stop words) as 
+they tend to slow down searches without improving the quality of the 
+results. Terms such as <em>"where"</em> and <em>"how"</em>, as well 
+as certain single digits and single letters, are not included in searches.</p>
+
+
+<a name="context"><h3>See your search terms in context</h3> </a> 
+<p> Each search result contains at least one excerpt from the found 
+web page, which shows how your search terms are used in context on that 
+page. Your search terms are bolded so you can tell at a glance whether 
+the result is a page you want to visit. </p>
+
+<a name="stemming"><h3>Does our search use stemming?</h3> </a>
+Our search allows to find same words with different 
+endings. For example, it will also try to find the word "test" if 
+"testing" or "tests" is given in search query.
+
+<a name=case><h3>Does capitalization matter?</h3></a> 
+<p> The searches are <b>not</b> case sensitive. All letters, regardless 
+of how you type them, will be understood as lower case. For example, 
+searches for "george washington", "George Washington", and "gEoRgE wAsHiNgToN" 
+ will all return the same results.</p>
+      
+</blockquote>
+</body>
+</html>
+