Index: openacs-4/packages/edit-this-page/tcl/etp-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-procs-oracle.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/edit-this-page/tcl/etp-procs-oracle.xql	17 Nov 2001 19:48:47 -0000	1.4
+++ openacs-4/packages/edit-this-page/tcl/etp-procs-oracle.xql	19 Nov 2001 05:35:59 -0000	1.5
@@ -117,11 +117,12 @@
            and i.live_revision = r.revision_id(+)
      ) attributes
      where $extra_where_clauses
-     order by $orderby
+     order by item_id
      $limit_clause
 </querytext>
 </fullquery>
 
+
 <fullquery name="etp::get_subtopics.get_subtopics">
 <querytext>
 select child.name, child.node_id, child.object_id as package_id,
@@ -135,4 +136,23 @@
 </querytext>
 </fullquery>
  
+
+   <partialquery name="etp::get_attribute_lookup_sql.archive_where_clause">
+      <querytext>
+        etp.get_attribute_value(r.revision_id, $attribute_id)
+      </querytext>
+   </partialquery>
+
+   <partialquery name="etp::get_content_items.gci_columns_clause">
+      <querytext>
+       i.item_id, i.name,
+                 to_char(r.publish_date, 'Mon DD, YYYY') as publish_date,
+                 (select object_type from acs_objects 
+                   where object_id = i.item_id) as object_type,
+                 etp.get_relative_url(i.item_id, i.name) as url,
+                 etp.get_title(i.item_id, r.title) as title,
+                 etp.get_description(i.item_id, r.description) as description
+      </querytext>
+   </partialquery>
+
 </queryset>
Index: openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql	31 Oct 2001 05:13:54 -0000	1.3
+++ openacs-4/packages/edit-this-page/tcl/etp-procs-postgresql.xql	19 Nov 2001 05:35:50 -0000	1.4
@@ -140,4 +140,21 @@
 </querytext>
 </fullquery>
 
+   <partialquery name="etp::get_attribute_lookup_sql.archive_where_clause">
+      <querytext>
+        etp__get_attribute_value(r.revision_id, $attribute_id)
+      </querytext>
+   </partialquery>
+
+   <partialquery name="etp::get_content_items.gci_columns_clause">
+      <querytext>
+         i.item_id, i.name, tree_sortkey as sort_order,
+           to_char(r.publish_date, 'Mon DD, YYYY') as publish_date,
+           (select object_type from acs_objects 
+            where object_id = i.item_id) as object_type,
+                 etp__get_relative_url(i.item_id, i.name) as url,
+                 etp__get_title(i.item_id, r.title) as title,
+                 etp__get_description(i.item_id, r.description) as description      
+      </querytext>
+   </partialquery>
 </queryset>
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 -N -r1.3 -r1.4
--- openacs-4/packages/edit-this-page/tcl/etp-procs.tcl	31 Oct 2001 05:13:54 -0000	1.3
+++ openacs-4/packages/edit-this-page/tcl/etp-procs.tcl	19 Nov 2001 05:35:41 -0000	1.4
@@ -344,6 +344,7 @@
 
 	foreach attribute_desc $attributes {
 	    set lookup_sql [etp::get_attribute_lookup_sql $attribute_desc]
+            ns_log Error "LU: $lookup_sql"
 	    append extended_attributes ",\n $lookup_sql"
 	}
     }
@@ -446,7 +447,7 @@
     set attribute_name [etp::get_attribute_name $attribute_desc]
     set default [etp::get_attribute_default $attribute_desc]
 
-    set lookup_sql "etp__get_attribute_value(r.revision_id, $attribute_id)"
+    set lookup_sql [db_map lookup_sql_clause]
 
     # see if a select-list callback function was specified
     if { [info commands $default] != "" } {
@@ -478,7 +479,7 @@
     set url_stub [ns_conn url]
     array set site_node [site_node $url_stub]
     set urlc [regexp -all "/" $url_stub]
-    if { ($site_node(package_key) == "editthispage" ||
+    if { ($site_node(package_key) == "edit-this-page" ||
           ($site_node(package_key) == "acs-subsite" && $urlc == 1)) &&
          [ad_permission_p [ad_conn package_id] write] } {
 
@@ -565,15 +566,12 @@
     set result_name "content_items"
 
     set orderby "attributes.sort_order"
+
     set extra_where_clauses "1 = 1"
-    set columns "i.item_id, i.name, tree_sortkey as sort_order,
-                 to_char(r.publish_date, 'Mon DD, YYYY') as publish_date,
-                 (select object_type from acs_objects 
-                   where object_id = i.item_id) as object_type,
-                 etp__get_relative_url(i.item_id, i.name) as url,
-                 etp__get_title(i.item_id, r.title) as title,
-                 etp__get_description(i.item_id, r.description) as description
-                 "
+    
+    set columns [db_map gci_columns_clause]
+    ns_log warning "columns: $columns"
+    
     set limit_clause ""
 
     for {set i 0} {$i < [llength $args]} {incr i} {
@@ -617,11 +615,12 @@
 	    if { ![empty_string_p $attr_desc] } {
 		ns_log Notice "adding it"
 		set lookup_sql [etp::get_attribute_lookup_sql $attr_desc]
+                nslog Error "LU: $lookup_sql"
 		append columns ",\n $lookup_sql"
 	    }
 	}
     }
-
+  
     upvar $result_name $result_name
 
     db_multirow $result_name get_content_items ""
@@ -665,4 +664,4 @@
     }
 }
 
-}
\ No newline at end of file
+}