Index: /trunk/glueforge/glueforge.in
===================================================================
--- /trunk/glueforge/glueforge.in	(revision 3860)
+++ /trunk/glueforge/glueforge.in	(revision 3861)
@@ -3,5 +3,5 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: glueforge.in,v 1.6 2005-04-21 03:29:20 jhoblitt Exp $
+# $Id: glueforge.in,v 1.7 2005-05-06 04:07:42 jhoblitt Exp $
 
 use strict;
@@ -51,8 +51,8 @@
 }
 
-$data{data_type} = $data{table_name} . "Row";
-$data{lib_name}  = $data{table_name} . "db";
-$data{file_name} = $data{lib_name};
-$data{namespace} = $data{table_name};
+$data{object_name} = $data{table_name} . "Row";
+$data{lib_name}    = $data{table_name} . "db";
+$data{file_name}   = $data{lib_name};
+$data{namespace}   = $data{table_name};
 
 my @items;
Index: unk/glueforge/templates/psdb/datatype.tt
===================================================================
--- /trunk/glueforge/templates/psdb/datatype.tt	(revision 3860)
+++ 	(revision )
@@ -1,8 +1,0 @@
-[% USE format -%]
-[% indented = format('%-15s %s') -%]
-typedef struct {
-[% SET i = 0 -%]
-[% FOREACH item = columns -%]
-    [% indented("$item.ctype", "$item.name") %];
-[% END -%]
-} [% data_type %];
Index: /trunk/glueforge/templates/psdb/header.tt
===================================================================
--- /trunk/glueforge/templates/psdb/header.tt	(revision 3860)
+++ /trunk/glueforge/templates/psdb/header.tt	(revision 3861)
@@ -11,8 +11,9 @@
 /// @{
 
-[% INCLUDE datatype.tt %]
+[% INCLUDE object_h.tt %]
 [% INCLUDE init_h.tt %]
 [% INCLUDE create_h.tt %]
 [% INCLUDE insert_h.tt %]
+[% INCLUDE insertobject_h.tt %]
 [% INCLUDE pop_h.tt %]
 
Index: /trunk/glueforge/templates/psdb/object_h.tt
===================================================================
--- /trunk/glueforge/templates/psdb/object_h.tt	(revision 3861)
+++ /trunk/glueforge/templates/psdb/object_h.tt	(revision 3861)
@@ -0,0 +1,13 @@
+[% USE format -%]
+[% indented = format('%-15s %s') -%]
+/** [% object_name %] data structure
+ *
+ * Structure for representing a single row of [% table_name %] table data.
+ */
+
+typedef struct {
+[% SET i = 0 -%]
+[% FOREACH item = columns -%]
+    [% indented("$item.ctype", "$item.name") %];
+[% END -%]
+} [% object_name %];
Index: /trunk/glueforge/templates/psdb/pop_h.tt
===================================================================
--- /trunk/glueforge/templates/psdb/pop_h.tt	(revision 3860)
+++ /trunk/glueforge/templates/psdb/pop_h.tt	(revision 3861)
@@ -6,5 +6,5 @@
  */
 
-[% data_type %] [% namespace %]Pop(
+[% object_name %] [% namespace %]Pop(
     psDB            *dbh                ///< Database handle
 );