Index: openacs-4/packages/edit-this-page/edit-this-page.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/edit-this-page.info,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/edit-this-page/edit-this-page.info	29 Jul 2015 02:06:21 -0000	1.16
+++ openacs-4/packages/edit-this-page/edit-this-page.info	13 Feb 2016 16:38:05 -0000	1.17
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="1.9d3" url="http://openacs.org/repository/download/apm/edit-this-page-1.9d3.apm">
+    <version name="1.9d4" url="http://openacs.org/repository/download/apm/edit-this-page-1.9d4.apm">
     <database-support>
         <database>postgresql</database>
     </database-support>
@@ -17,7 +17,7 @@
         <summary>An easy-to-use content management system.</summary>
         <description format="text/html">An Easy to use publishing system with versioning and permissions.</description>
 
-        <provides url="edit-this-page" version="1.9d3"/>
+        <provides url="edit-this-page" version="1.9d4"/>
         <requires url="acs-kernel" version="4.6.2"/>
         <requires url="acs-subsite" version="4.6.3"/>
         <requires url="acs-templating" version="4.1.2"/>
Index: openacs-4/packages/edit-this-page/tcl/etp-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-procs.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/edit-this-page/tcl/etp-procs.tcl	27 Jun 2015 20:03:21 -0000	1.27
+++ openacs-4/packages/edit-this-page/tcl/etp-procs.tcl	13 Feb 2016 16:38:05 -0000	1.28
@@ -99,14 +99,9 @@
 	    attribute_metadata record has incorrect format"
 	    return
 	}
-		
-	set a_name [lindex $attribute 0]
-	set a_pretty_name [lindex $attribute 1]
-	set a_pretty_plural [lindex $attribute 2]
-	set a_datatype [lindex $attribute 3]
-	set a_html [lindex $attribute 4]
-	set a_default [lindex $attribute 5]
 
+	lassign $attribute a_name a_pretty_name a_pretty_plural a_datatype a_html a_default
+
 	if { ![db_0or1row attribute_exists ""] } {
 	    set attribute_id [db_exec_plsql attribute_create ""]
 	}
Index: openacs-4/packages/edit-this-page/tcl/etp-sc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-sc-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/edit-this-page/tcl/etp-sc-procs.tcl	7 Sep 2013 12:50:57 -0000	1.6
+++ openacs-4/packages/edit-this-page/tcl/etp-sc-procs.tcl	13 Feb 2016 16:38:05 -0000	1.7
@@ -29,7 +29,7 @@
     # which the proc can modify if it likes to add additional
     # content to be indexed.
 
-    if {[llength [info procs "etp::search::$content_type"]]==1} {
+    if {[info commands "etp::search::$content_type"] ne ""} {
 	[etp::search::$content_type -array_name "datasource"]
     }
 
@@ -65,13 +65,13 @@
 
     db_transaction {
 	# create the implementation if it does not exist
-	if {![etp::search_impl_exists_p -content_type $content_type]==1} {
+	if {[db_0or1row get_contract_id {}] == 0} { 
 	    db_exec_plsql create_search_impl {}
 	    db_exec_plsql create_datasource_alias {}
 	    db_exec_plsql create_url_alias {}
 	}
 	# install the binding if it does not exist
-	if {![acs_sc_binding_exists_p "FtsContentProvider" $content_type]==1} {
+	if {[acs_sc_binding_exists_p "FtsContentProvider" $content_type] != 1} {
 	    db_exec_plsql install_binding {}
 	}
     } on_error {
@@ -106,4 +106,4 @@
 	upvar search_array $array_name
 	ns_log debug "etp::search::etp_page_revision: arrayname:$array_name"
     }
-}
\ No newline at end of file
+}