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.29 -r1.30
--- openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	10 Jan 2007 21:22:03 -0000	1.29
+++ openacs-4/packages/acs-content-repository/tcl/filter-procs.tcl	13 Apr 2007 10:23:25 -0000	1.30
@@ -233,10 +233,10 @@
     if { $rev_id eq "" } {
       if {"best" eq $revision} {
 	  # lastest_revision unless live_revision is set, then live_revision
-	  set revision_id [::item::get_best_revision $item_id]
+	  set revision_id [::content::item::get_best_revision -item_id $item_id]
       } else {
 	  # default live_revision
-	  set revision_id [::item::get_live_revision $item_id]
+	  set revision_id [::content::item::get_live_revision -item_id $item_id]
       }
 
       if {$revision_id eq ""} {
Index: openacs-4/packages/acs-content-repository/tcl/item-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/item-procs-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-content-repository/tcl/item-procs-postgresql.xql	11 Apr 2007 18:46:19 -0000	1.11
+++ openacs-4/packages/acs-content-repository/tcl/item-procs-postgresql.xql	13 Apr 2007 10:23:25 -0000	1.12
@@ -3,22 +3,6 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="item::get_title.gt_get_title">      
-      <querytext>
-      
-    select content_item__get_title(:item_id, 'f') 
-  
-      </querytext>
-</fullquery>
-
-<fullquery name="item::is_publishable.ip_is_publishable_p">      
-      <querytext>
-      
-    select content_item__is_publishable(:item_id) 
-  
-      </querytext>
-</fullquery>
-
 <partialquery name="item::get_revision_content.grc_get_all_content_1">
 	<querytext>
 
@@ -27,14 +11,6 @@
 	</querytext>
 </partialquery>
 
-<fullquery name="item::get_id.id_get_item_id">      
-      <querytext>
-
-      select content_item__get_id(:url $root_sql) 
-  
-      </querytext>
-</fullquery>
-
 <fullquery name="item::content_is_null.cin_get_content">      
       <querytext>
       
@@ -47,59 +23,4 @@
       </querytext>
 </fullquery>
 
-<fullquery name="item::get_template_id.gti_get_template_id">      
-      <querytext>
-
-    select content_item__get_template(:item_id, :context) as template_id
-    from dual
-
-      </querytext>
-</fullquery>
-
-<fullquery name="item::get_url.gu_get_path">      
-      <querytext>
-      
-    select content_item__get_path(:item_id, $root_folder_id) 
-  
-      </querytext>
-</fullquery>
-
-<fullquery name="item::get_best_revision.gbr_get_best_revision">      
-      <querytext>
-      
-    select content_item__get_best_revision(:item_id) 
-  
-      </querytext>
-</fullquery>
-
-<fullquery name="item::copy.copy_item">      
-      <querytext>
-      
-         select content_item__copy(
-                  :item_id,
-                  :target_folder_id,
-                  :creation_user,
-                  :creation_ip
-                )
-  
-      </querytext>
-</fullquery>
-
-<fullquery name="item::publish.set_live">
-    <querytext>
-      select content_item__set_live_revision(
-          :revision_id,
-          'live'
-      )
-    </querytext>
-</fullquery>
-
-<fullquery name="item::unpublish.unset_live">
-    <querytext>
-            select content_item__unset_live_revision(
-                 :item_id
-            );
-    </querytext>
-</fullquery>
-      
 </queryset>
Index: openacs-4/packages/acs-content-repository/tcl/item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/item-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/acs-content-repository/tcl/item-procs.tcl	12 Apr 2007 11:52:36 -0000	1.23
+++ openacs-4/packages/acs-content-repository/tcl/item-procs.tcl	13 Apr 2007 10:23:25 -0000	1.24
@@ -411,8 +411,6 @@
 
 ad_proc -public -deprecated item::is_publishable { item_id } {
 
-  @public is_publishable
- 
   Determine if the item is publishable. The item is publishable only
   if:
   <ul>
@@ -544,7 +542,7 @@
     return ""
   }
 
-  return [get_url $template_id]
+  return [::content::item::get_virtual_path -item_id $template_id]
 }
 
 ad_proc -public -deprecated item::get_url {
Index: openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl	10 Jan 2007 21:22:03 -0000	1.7
+++ openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl	13 Apr 2007 10:23:25 -0000	1.8
@@ -19,7 +19,6 @@
     
     @see publish::get_template_root
     @see publish::get_publish_roots
-    
 } {
     # LARS TODO: This parameter doesn't exist, it's a remnant from the CMS package
     set root_path [parameter::get \
@@ -271,7 +270,7 @@
   set error_msg ""
 
   if { [template::util::is_nil opts(revision_id)] } {
-    set revision_id [item::get_live_revision $item_id]
+    set revision_id [::content::item::get_live_revision -item_id $item_id]
   } else {
     set revision_id $opts(revision_id)
   }
@@ -349,14 +348,14 @@
  
   @return The HTML for the include tag
  
-  @see item::get_url
+  @see content::item::get_virtual_path
   @see publish::html_args
 
 } {
 
   # Concatenate all the extra html arguments into a string
   set extra_html [publish::html_args $extra_args]""
-  set item_url [item::get_url $item_id]
+  set item_url [::content::item::get_virtual_path -item_id $item_id]
   return "<include src=\"$item_url\" $extra_html item_id=$item_id>"
 }
 
@@ -443,19 +442,19 @@
 
 } {
   #set ::content::item_id $item_id
-  set ::content::item_url [item::get_url $item_id]
+  set ::content::item_url [::content::item::get_virtual_path -item_id $item_id]
 
   template::util::get_opts $args
 
   # Either auto-get the live revision or use the parameter
   if { ![template::util::is_nil opts(revision_id)] } {
     set revision_id $opts(revision_id)
   } else {
-    set revision_id [item::get_live_revision $item_id]
+    set revision_id [::content::item::get_live_revision -item_id $item_id]
   }
 
   # Get the template 
-  set ::content::template_url [item::get_template_url $item_id]    
+  set ::content::template_url [::content::item::get_template -item_id $item_id -use_context public]
 
   if {$::content::template_url eq {}} { 
     ns_log Warning "publish::merge_with_template: no template for item $item_id"
@@ -495,7 +494,7 @@
   template::util::get_opts $args
 
   if { [template::util::is_nil opts(revision_id)] } {
-    set revision_id [item::get_live_revision $item_id]
+    set revision_id [::content::item::get_live_revision -item_id $item_id]
   } else {
     set revision_id $opts(revision_id)
   } 
@@ -626,7 +625,7 @@
 
   if { [template::util::is_nil ::content::revision_id] } {
     set item_id [get_main_item_id]
-    set ret [item::get_live_revision $item_id]
+    set ret [::content::item::get_live_revision -item_id $item_id]
   } else {
     set ret $::content::revision_id
   }
@@ -683,7 +682,7 @@
 
   # Process options
   if { [template::util::is_nil opts(revision_id)] } {
-    set revision_id [item::get_live_revision $item_id]
+    set revision_id [::content::item::get_live_revision -item_id $item_id]
   } else {
     set revision_id $opts(revision_id)
   }