Index: openacs.org-dev/packages/edit-this-page/tcl/etp-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/edit-this-page/tcl/etp-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/edit-this-page/tcl/etp-procs.tcl	9 Aug 2002 04:51:29 -0000	1.2
+++ openacs.org-dev/packages/edit-this-page/tcl/etp-procs.tcl	26 Sep 2002 20:00:19 -0000	1.3
@@ -1,4 +1,5 @@
 # etp-procs.tcl
+# test cvs log email
 
 ad_library {
     Helper procedures for Edit This Page
@@ -478,9 +479,11 @@
 } {
     set url_stub [ns_conn url]
     array set site_node [site_node $url_stub]
+
+ns_log notice "DAVEB: [site_node $url_stub]"
     set urlc [regexp -all "/" $url_stub]
     if { ($site_node(package_key) == "edit-this-page" ||
-          ($site_node(package_key) == "acs-subsite" && $urlc == 1)) &&
+          ($site_node(package_key) == "acs-subsite")) &&
          [ad_permission_p [ad_conn package_id] write] } {
 
 	set name [etp::get_name]
Index: openacs.org-dev/packages/edit-this-page/tcl/etp-sc-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/edit-this-page/tcl/etp-sc-procs-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs.org-dev/packages/edit-this-page/tcl/etp-sc-procs-postgresql.xql	26 Sep 2002 20:00:19 -0000	1.1
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="etp::revision_url.package_url">
+    <querytext>
+select site_node__url(node_id) as package_url from site_nodes where object_id = (select package_id from cr_folders where folder_id= (select parent_id from cr_items where latest_revision = :object_id))
+    </querytext>
+</fullquery>
+
+<fullquery name="etp::revision_url.revision_url">
+	<querytext>
+        select name as url, parent_id as package_id
+        from cr_items 
+	where live_revision = :object_id
+	</querytext>
+</fullquery>
+
+
+<fullquery name="etp::revision_datasource.revision_datasource">
+      <querytext>
+       	select r.revision_id as object_id,
+	       r.title as title,
+	       content as content,
+	       'text/html' as mime,
+	       '' as keywords,
+	       'text' as storage_type
+	from cr_revisions r
+	       where revision_id = :object_id
+      </querytext>
+</fullquery>
+
+<fullquery name="etp::revision_url.package_url">
+    <querytext>
+select site_node__url(node_id) as package_url from site_nodes where object_id = (select package_id from cr_folders where folder_id= (select parent_id from cr_items where latest_revision = :object_id))
+    </querytext>
+</fullquery>
+
+<fullquery name="etp::revision_url.revision_url">
+	<querytext>
+        select name as url, parent_id as package_id
+        from cr_items 
+	where live_revision = :object_id
+	</querytext>
+</fullquery>
+
+</queryset>
Index: openacs.org-dev/packages/edit-this-page/tcl/etp-sc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/edit-this-page/tcl/etp-sc-procs.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs.org-dev/packages/edit-this-page/tcl/etp-sc-procs.tcl	26 Sep 2002 20:00:19 -0000	1.1
@@ -0,0 +1,37 @@
+# edit-this-page/tcl/etp-sc-procs.tcl
+# implements OpenFTS Search service contracts
+# Dave Bauer dave@thedesignexperience.org
+# 2002-08-13
+
+# Right now I am leaving the keywords blank
+# in the future we should either extract them from the META keyword tag
+# or allow assignment of cr_keywords to static_pages
+
+
+# nope, its for etp now :)
+namespace eval etp {
+ad_proc revision_datasource {
+    object_id
+} {
+    @author Dave Bauer
+} {
+ 
+    db_0or1row revision_datasource ""     -column_array datasource
+
+    return [array get datasource]
+}
+
+ad_proc revision_url {
+    object_id
+} {
+    @author Dave Bauer
+} {
+ns_log notice "DAVEB: object_id=$object_id"
+	db_1row revision_url "select name as url, parent_id from cr_items 
+	where live_revision = :object_id"
+	set package_url [db_string package_url "select site_node__url(node_id) as package_url from site_nodes where object_id =(select package_id from cr_folders where folder_id= :parent_id"]
+
+    return "${package_url}${url}"
+}
+
+}