Index: openacs-4/packages/acs-content-repository/tcl/filter-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs-oracle.xql,v
diff -u -r1.7 -r1.7.4.1
--- openacs-4/packages/acs-content-repository/tcl/filter-procs-oracle.xql 7 Jul 2003 12:25:53 -0000 1.7
+++ openacs-4/packages/acs-content-repository/tcl/filter-procs-oracle.xql 21 Jan 2005 20:35:00 -0000 1.7.4.1
@@ -56,33 +56,6 @@
-
-
-
-
- select
- item_id, content_type
- from
- cr_items
- where
- item_id = content_item.get_id(:url, :content_root)
-
-
-
-
-
-
-
- select
- item_id, content_type
- from
- cr_items
- where
- item_id = content_item.get_id(:url, :template_root)
-
-
-
-
Index: openacs-4/packages/acs-content-repository/tcl/filter-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs-postgresql.xql,v
diff -u -r1.9 -r1.9.4.1
--- openacs-4/packages/acs-content-repository/tcl/filter-procs-postgresql.xql 7 Jul 2003 12:25:53 -0000 1.9
+++ openacs-4/packages/acs-content-repository/tcl/filter-procs-postgresql.xql 21 Jan 2005 20:35:00 -0000 1.9.4.1
@@ -40,33 +40,6 @@
-
-
-
-
- select
- item_id, content_type
- from
- cr_items
- where
- item_id = content_item__get_id(:url, :content_root, 'f')
-
-
-
-
-
-
-
- select
- item_id, content_type
- from
- cr_items
- where
- item_id = content_item__get_id(:url, :template_root, 'f')
-
-
-
-
Index: openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl,v
diff -u -r1.16.2.3 -r1.16.2.4
--- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl 11 Jul 2004 19:15:21 -0000 1.16.2.3
+++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl 21 Jan 2005 20:35:00 -0000 1.16.2.4
@@ -169,13 +169,20 @@
}
# cache this query persistently for 1 hour
- db_0or1row get_item_info "" -column_array item_info
-
+ set item_info(item_id) [::content::item::get_id -item_path $url \
+ -root_folder_id $content_root \
+ -resolve_index "f"]
+ set item_info(content_type) [::content::item::get_content_type \
+ -item_id $item_id]
+
# No item found, so do not handle this request
- if { ![info exists item_info] } {
- db_0or1row get_template_info "" -column_array item_info
-
- if { ![info exists item_info] } {
+ if { [string equal "" $item_info(item_id)] } {
+ set item_info(item_id) [::content::item::get_id -item_path $url \
+ -root_folder_id $content_root \
+ -resolve_index "f"]
+ set item_info(content_type) [::content::item::get_content_type \
+ -item_id $item_id]
+ if { [string equal "" $item_info(item_id)] } {
ns_log notice "content::init: no content found for url $url"
return 0
}