Index: openacs-4/packages/acs-content-repository/tcl/doc-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/doc-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-content-repository/tcl/doc-procs.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-content-repository/tcl/doc-procs.tcl	27 Apr 2001 02:27:09 -0000	1.2
@@ -11,7 +11,7 @@
         
         upvar $info_ref info
         
-        template::query info_source onevalue "
+        template::query get_info info_source onevalue "
         select doc.get_package_header(:package_name) from dual
         "
         
@@ -44,16 +44,9 @@
     upvar $doc_ref  doc
     upvar $code_ref code
 
-    if { [template::util::is_nil db] } {    
-      set db [ns_db gethandle]
-      set free_db 1
-    } else {
-      set free_db 0
-    }
-
-    template::query header onevalue "
+    template::query get_header header onevalue "
       select doc.get_proc_header(:proc_name, :package_name) from dual
-    " -db $db
+    "
 
     # Get JavaDoc block, if any
     if { [regexp {/\*\*(.*)\*/} $header match] } {
@@ -65,10 +58,6 @@
       set doc ""
       set code $header
     }
-
-    if { $free_db } {
-      ns_db releasehandle $db
-    }
   }
 
   # Parse the header block and prepare the datasources:
@@ -163,14 +152,7 @@
   # { {label value} {label value} ... }
   proc package_list { {db ""} } {
 
-    if { [template::util::is_nil db] } {
-      set db [ns_db gethandle] 
-      set free_db 1
-    } else {
-      set free_db 0
-    }
-
-    template::query result multilist "
+    template::query get_packages result multilist "
       select distinct 
         lower(name) as label,  
         lower(name) as value 
@@ -180,11 +162,7 @@
         type='PACKAGE'
       and
         line=1
-      order by label" -db $db
-
-    if { $free_db } {
-      ns_db releasehandle $db
-    }
+      order by label"
  
     return $result
   }  
@@ -193,14 +171,7 @@
   # { value value ... }
   proc func_list { package_name {db ""} } {
 
-    if { [template::util::is_nil db] } {
-      set db [ns_db gethandle] 
-      set free_db 1
-    } else {
-      set free_db 0
-    }
-
-    template::query result multilist "
+    template::query get_funcs result multilist "
       select distinct 
         lower(text) as line_header 
       from 
@@ -214,12 +185,8 @@
         or
           lower(text) like '%function%'
       )
-      order by line_header" -db $db
+      order by line_header"
 
-    if { $free_db } {
-      ns_db releasehandle $db
-    }
-
     set line_opts [list]
     foreach line $result {
       # Only get lines in form "procedure proc_name..." or "function func_name..."
@@ -237,20 +204,13 @@
   # { value value ... }
   proc func_multirow { package_name result_ref {db ""} } {
 
-    if { [template::util::is_nil db] } {
-      set db [ns_db gethandle] 
-      set free_db 1
-    } else {
-      set free_db 0
-    }
-
     upvar "${result_ref}:rowcount" result_rowcount
     set result_rowcount 0
 
     # Get each line that contains "procedure" or "function" in it
     # Pretty risky... The like query should be improved to return 
     # less false matches
-    template::query result multirow "
+    template::query get_functions result multirow "
       select distinct 
         lower(text) as line_header 
       from 
@@ -264,7 +224,7 @@
         or
           lower(text) like '%function%'
       )
-      order by line_header" -db $db -eval {
+      order by line_header" -eval {
 
       # Only insert a row into the datasource if it looks like a procedure
       # or function definition
@@ -279,9 +239,5 @@
         set result_row(name) [string tolower $name]
       }
     }
- 
-    if { $free_db } {
-      ns_db releasehandle $db
-    }
   }   
 }