Index: openacs-4/packages/cms/www/modules/items/attributes-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/attributes-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/attributes-edit.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/attributes-edit.tcl	16 Aug 2002 00:32:08 -0000	1.3
@@ -6,19 +6,8 @@
 # check permissions - user must have cm_write on the item
 content::check_access $item_id cm_write -user_id [User::getID]
 
-template::query get_item one_item onerow "
-  select 
-    i.content_type, i.name, nvl(r.title, i.name) title, i.latest_revision
-  from
-    cr_items i, cr_revisions r
-  where
-   i.item_id = :item_id
-  and
-   i.latest_revision = r.revision_id (+)
-"
+db_1row get_item_info ""
 
-template::util::array_to_vars one_item
-
 # flush the sitemap folder listing cache in anticipation 
 # of the new item
 cms_folder::flush sitemap $item_id
Index: openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-1.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-1.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-1.tcl	16 Aug 2002 00:32:08 -0000	1.3
@@ -19,16 +19,8 @@
 content::check_access $parent_id cm_new -user_id [User::getID]
 
 
-template::query get_content_type content_type_name onevalue "
-  select
-    pretty_name
-  from
-    acs_object_types
-  where
-    object_type = :content_type
-" 
+set content_type_name [db_string get_content_type ""]
 
-
 if { [template::util::is_nil content_type_name] } {
     ns_log Notice "ERROR: create-1.tcl - BAD CONTENT_TYPE - $content_type"
     template::forward "../sitemap/index"
Index: openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-2.tcl	27 May 2001 04:39:19 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/custom/cr_demo_article_image/create-2.tcl	16 Aug 2002 00:32:08 -0000	1.5
@@ -134,14 +134,7 @@
 	  - $errmsg"
 
             # check for double click
-            template::query get_clicks clicks onevalue "
-	  select
-	    count(1)
-	  from
-	    cr_items
-	  where
-	    item_id = :item_id
-	" 
+            set clicks [db_string get_clicks ""]
 
             db_abort_transaction
 
Index: openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.tcl	27 May 2001 04:39:19 -0000	1.5
+++ openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.tcl	16 Aug 2002 00:32:08 -0000	1.6
@@ -12,22 +12,8 @@
     revision_id  -datatype integer -widget hidden
 }
 
-template::query get_item_info item_info onerow "
-  select 
-    i.name, i.latest_revision, r.title 
-  from 
-    cr_items i, cr_revisions r
-  where 
-    i.item_id = :item_id
-  and
-    i.item_id = r.item_id
-  and
-    i.latest_revision = r.revision_id
-"
+db_1row get_item_info ""
 
-template::util::array_to_vars item_info
-
-
 content::add_attribute_elements image image $latest_revision
 
 element set_properties image mime_type -widget hidden
@@ -51,14 +37,7 @@
     set ip_address [ns_conn peeraddr]
 
     db_transaction {
-        template::query get_latest latest_revision onevalue "
-      select
-        latest_revision
-      from
-        cr_items
-      where
-        item_id = :item_id
-    " 
+        set latest_revision [db_string get_latest ""]
 
         # create the revision
         if { [catch {db_exec_plsql "
@@ -73,14 +52,7 @@
       end;"  } revision_id] } {
 
             # check for dupe submit
-            template::query get_clicks clicks onevalue "
-	  select
-	    count(1)
-	  from
-	    cr_revisions
-	  where
-	    revision_id = :revision_id
-	" 
+            set clicks [db_string get_clicks ""]
 
             db_abort_transaction
 
Index: openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.tcl	27 May 2001 04:39:19 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/custom/image/content-add-1.tcl	16 Aug 2002 00:32:08 -0000	1.4
@@ -4,16 +4,8 @@
 request set_param revision_id -datatype integer
 
 
+set item_id [db_string get_item_id ""]
 
-template::query get_item_id item_id onevalue "
-  select
-    item_id
-  from
-    cr_revisions
-  where
-    revision_id = :revision_id
-"
-
 # permissions check - need cm_new on parent_id to create new image
 content::check_access $item_id cm_write -user_id [User::getID]
 
Index: openacs-4/packages/cms/www/modules/items/custom/image/create-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/create-1.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/cms/www/modules/items/custom/image/create-1.tcl	27 May 2001 04:39:19 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/custom/image/create-1.tcl	16 Aug 2002 00:32:08 -0000	1.5
@@ -118,14 +118,7 @@
             ns_log notice "custom/image/create-1.tcl caught error - $errmsg"
 
             # check for double click
-            template::query get_clicks clicks onevalue "
-	  select
-	    count(1)
-	  from
-	    cr_items
-	  where
-	    item_id = :item_id
-	" 
+            set clicks [db_string get_clicks ""]
 
             db_abort_transaction
 
Index: openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.tcl	27 May 2001 04:39:19 -0000	1.3
+++ openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.tcl	16 Aug 2002 00:32:08 -0000	1.4
@@ -15,23 +15,8 @@
     item_id      -datatype integer -widget hidden -param
 }
 
-template::query get_item_info item_info onerow "
-  select 
-    i.name, i.latest_revision, r.title 
-  from 
-    cr_items i, cr_revisions r
-  where 
-    i.item_id = :item_id
-  and
-    i.item_id = r.item_id
-  and
-    i.latest_revision = r.revision_id
-" 
+db_1row get_item_info ""
 
-template::util::array_to_vars item_info
-
-
-
 content::add_attribute_elements image image $latest_revision
 
 element set_properties image mime_type -widget hidden