Index: openacs-4/packages/acs-templating/tcl/query-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/query-procs.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-templating/tcl/query-procs.tcl	30 Nov 2002 17:24:15 -0000	1.12
+++ openacs-4/packages/acs-templating/tcl/query-procs.tcl	17 May 2003 10:05:27 -0000	1.13
@@ -629,6 +629,8 @@
     <dd> appends the row to an existing multirow.</dd>
     <dt> <b>template::multirow size datasourcename</b></dt>
     <dd> returns the rowcount</dd>
+    <dt> <b>template::multirow columns datasourcename</b></dt>
+    <dd> returns the columns in the datasource</dd>
     <dt> <b>template::multirow get datasourcename rownum [column]</b></dt>
     <dd> returns the row of of data (or the particular row/column if column is provided)</dd>
     <dt> <b>template::multirow get datasourcename rownum column value</b></dt>
@@ -694,10 +696,18 @@
     size {
       upvar $multirow_level_up $name:rowcount rowcount
       if { [template::util::is_nil rowcount] } {
-        error "malformed multirow datasource - $name"
+          return 0
       }
       return $rowcount
     }
+
+    columns {
+      upvar $multirow_level_up $name:columns columns
+      if { [template::util::is_nil columns] } {
+          return {}
+      }
+      return $columns
+    }
     
     get {
       
@@ -750,6 +760,10 @@
       
       upvar $multirow_level_up $name:rowcount rowcount $name:columns columns
 
+      if {![info exists rowcount] || ![info exists columns]} { 
+        return 
+      } 
+        
       for { set i 1 } { $i <= $rowcount } { incr i } {
         # Pull values into variables (and into the array - aks),
         # evaluate the code block, and pull values back out to