Index: trunk/ippdb/src/ippdb.h
===================================================================
--- trunk/ippdb/src/ippdb.h	(revision 10155)
+++ trunk/ippdb/src/ippdb.h	(revision 10238)
@@ -20,5 +20,5 @@
 /*
  *
- * This file was generated by glueforge 0.31
+ * This file was generated by glueforge 0.32
  *
  * Do NOT directly edit this file.
@@ -5976,383 +5976,4 @@
     bool            mdcf                ///< format as mdconfig or simple
 );
-/** detMasterFrameRow data structure
- *
- * Structure for representing a single row of detMasterFrame table data.
- */
-
-typedef struct {
-    psS32           det_id;
-    psS32           iteration;
-    char            *comment;
-} detMasterFrameRow;
-
-/** Creates a new detMasterFrameRow object
- *
- *  @return A new detMasterFrameRow object or NULL on failure.
- */
-
-detMasterFrameRow *detMasterFrameRowAlloc(
-    psS32           det_id,
-    psS32           iteration,
-    const char      *comment
-);
-
-/** Creates a new detMasterFrame table
- *
- * @return true on success
- */
-
-bool detMasterFrameCreateTable(
-    psDB            *dbh                ///< Database handle
-);
-
-/** Deletes a detMasterFrame table
- *
- * @return true on success
- */
-
-bool detMasterFrameDropTable(
-    psDB            *dbh                ///< Database handle
-);
-
-/** Insert a single row into a table
- *
- * This function constructs and inserts a single row based on it's parameters.
- *
- * @return true on success
- */
-
-bool detMasterFrameInsert(
-    psDB            *dbh,               ///< Database handle
-    psS32           det_id,
-    psS32           iteration,
-    const char      *comment
-);
-
-/** Deletes up to limit rows from the database and returns the number of rows actually deleted. 
- *
- * @return A The number of rows removed or a negative value on error
- */
-
-long long detMasterFrameDelete(
-    psDB            *dbh,               ///< Database handle
-    const psMetadata *where,            ///< Row match criteria
-    unsigned long long limit            ///< Maximum number of elements to delete 
-);
-
-/** Insert a single detMasterFrameRow object into a table
- *
- * This function constructs and inserts a single row based on it's parameters.
- *
- * @return true on success
- */
-
-bool detMasterFrameInsertObject(
-    psDB            *dbh,               ///< Database handle
-    detMasterFrameRow *object             ///< detMasterFrameRow object
-);
-
-/** Insert an array of detMasterFrameRow object into a table
- *
- * This function constructs and inserts multiple rows based on it's parameters.
- *
- * @return true on success
- */
-
-bool detMasterFrameInsertObjects(
-    psDB            *dbh,               ///< Database handle
-    psArray         *objects            ///< array of detMasterFrameRow objects
-);
-
-/** Insert data from a binary FITS table detMasterFrameRow into the database
- *
- * This function expects a psFits object with a FITS table as the first
- * extension.  The table must have at least one row of data in it, that is of
- * the appropriate format (number of columns and their type).  All other
- * extensions are ignored.
- *
- * @return true on success
- */
-
-bool detMasterFrameInsertFits(
-    psDB            *dbh,               ///< Database handle
-    const psFits    *fits               ///< psFits object
-);
-
-/** Selects up to limit from the database and returns them in a binary FITS table
- *
- * This function assumes an empty psFits object and will create a FITS table
- * as the first extension.
- *
- *  See psDBSelectRows() for documentation on the format of where.
- *
- * @return true on success
- */
-
-bool detMasterFrameSelectRowsFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    const psMetadata *where,            ///< Row match criteria
-    unsigned long long limit            ///< Maximum number of elements to return
-);
-
-/** Convert a detMasterFrameRow into an equivalent psMetadata
- *
- * @return A psMetadata pointer or NULL on error
- */
-
-psMetadata *detMasterFrameMetadataFromObject(
-    const detMasterFrameRow *object             ///< fooRow to convert into a psMetadata
-);
-
-/** Convert a psMetadata into an equivalent fooRow
- *
- * @return A detMasterFrameRow pointer or NULL on error
- */
-
-detMasterFrameRow *detMasterFrameObjectFromMetadata(
-    psMetadata      *md                 ///< psMetadata to convert into a fooRow
-);
-/** Selects up to limit rows from the database and returns as detMasterFrameRow objects in a psArray
- *
- *  See psDBSelectRows() for documentation on the format of where.
- *
- * @return A psArray pointer or NULL on error
- */
-
-psArray *detMasterFrameSelectRowObjects(
-    psDB            *dbh,               ///< Database handle
-    const psMetadata *where,            ///< Row match criteria
-    unsigned long long limit            ///< Maximum number of elements to return
-);
-/** Deletes a row from the database coresponding to an detMasterFrame
- *
- *  Note that a 'where' search psMetadata is constructed from each object and
- *  used to find rows to delete.
- *
- * @return A The number of rows removed or a negative value on error
- */
-
-bool detMasterFrameDeleteObject(
-    psDB            *dbh,               ///< Database handle
-    const detMasterFrameRow *object    ///< Object to delete
-);
-/** Deletes up to limit rows from the database and returns the number of rows actually deleted. 
- *
- *  Note that a 'where' search psMetadata is constructed from each object and
- *  used to find rows to delete.
- *
- * @return A The number of rows removed or a negative value on error
- */
-
-long long detMasterFrameDeleteRowObjects(
-    psDB            *dbh,               ///< Database handle
-    const psArray   *objects,           ///< Array of objects to delete
-    unsigned long long limit            ///< Maximum number of elements to delete 
-);
-/** Formats and prints an array of detMasterFrameRow objects
- *
- * When mdcf is set the formated output is in psMetadataConfig
- * format, otherwise it is in a simple tabular format.
- *
- * @return true on success
- */
-
-bool detMasterFramePrintObjects(
-    FILE            *stream,            ///< a stream
-    psArray         *objects,           ///< An array of detMasterFrameRow objects
-    bool            mdcf                ///< format as mdconfig or simple
-);
-/** detMasterImfileRow data structure
- *
- * Structure for representing a single row of detMasterImfile table data.
- */
-
-typedef struct {
-    psS32           det_id;
-    char            *class_id;
-    char            *uri;
-    char            *recipe;
-} detMasterImfileRow;
-
-/** Creates a new detMasterImfileRow object
- *
- *  @return A new detMasterImfileRow object or NULL on failure.
- */
-
-detMasterImfileRow *detMasterImfileRowAlloc(
-    psS32           det_id,
-    const char      *class_id,
-    const char      *uri,
-    const char      *recipe
-);
-
-/** Creates a new detMasterImfile table
- *
- * @return true on success
- */
-
-bool detMasterImfileCreateTable(
-    psDB            *dbh                ///< Database handle
-);
-
-/** Deletes a detMasterImfile table
- *
- * @return true on success
- */
-
-bool detMasterImfileDropTable(
-    psDB            *dbh                ///< Database handle
-);
-
-/** Insert a single row into a table
- *
- * This function constructs and inserts a single row based on it's parameters.
- *
- * @return true on success
- */
-
-bool detMasterImfileInsert(
-    psDB            *dbh,               ///< Database handle
-    psS32           det_id,
-    const char      *class_id,
-    const char      *uri,
-    const char      *recipe
-);
-
-/** Deletes up to limit rows from the database and returns the number of rows actually deleted. 
- *
- * @return A The number of rows removed or a negative value on error
- */
-
-long long detMasterImfileDelete(
-    psDB            *dbh,               ///< Database handle
-    const psMetadata *where,            ///< Row match criteria
-    unsigned long long limit            ///< Maximum number of elements to delete 
-);
-
-/** Insert a single detMasterImfileRow object into a table
- *
- * This function constructs and inserts a single row based on it's parameters.
- *
- * @return true on success
- */
-
-bool detMasterImfileInsertObject(
-    psDB            *dbh,               ///< Database handle
-    detMasterImfileRow *object             ///< detMasterImfileRow object
-);
-
-/** Insert an array of detMasterImfileRow object into a table
- *
- * This function constructs and inserts multiple rows based on it's parameters.
- *
- * @return true on success
- */
-
-bool detMasterImfileInsertObjects(
-    psDB            *dbh,               ///< Database handle
-    psArray         *objects            ///< array of detMasterImfileRow objects
-);
-
-/** Insert data from a binary FITS table detMasterImfileRow into the database
- *
- * This function expects a psFits object with a FITS table as the first
- * extension.  The table must have at least one row of data in it, that is of
- * the appropriate format (number of columns and their type).  All other
- * extensions are ignored.
- *
- * @return true on success
- */
-
-bool detMasterImfileInsertFits(
-    psDB            *dbh,               ///< Database handle
-    const psFits    *fits               ///< psFits object
-);
-
-/** Selects up to limit from the database and returns them in a binary FITS table
- *
- * This function assumes an empty psFits object and will create a FITS table
- * as the first extension.
- *
- *  See psDBSelectRows() for documentation on the format of where.
- *
- * @return true on success
- */
-
-bool detMasterImfileSelectRowsFits(
-    psDB            *dbh,               ///< Database handle
-    psFits          *fits,              ///< psFits object
-    const psMetadata *where,            ///< Row match criteria
-    unsigned long long limit            ///< Maximum number of elements to return
-);
-
-/** Convert a detMasterImfileRow into an equivalent psMetadata
- *
- * @return A psMetadata pointer or NULL on error
- */
-
-psMetadata *detMasterImfileMetadataFromObject(
-    const detMasterImfileRow *object             ///< fooRow to convert into a psMetadata
-);
-
-/** Convert a psMetadata into an equivalent fooRow
- *
- * @return A detMasterImfileRow pointer or NULL on error
- */
-
-detMasterImfileRow *detMasterImfileObjectFromMetadata(
-    psMetadata      *md                 ///< psMetadata to convert into a fooRow
-);
-/** Selects up to limit rows from the database and returns as detMasterImfileRow objects in a psArray
- *
- *  See psDBSelectRows() for documentation on the format of where.
- *
- * @return A psArray pointer or NULL on error
- */
-
-psArray *detMasterImfileSelectRowObjects(
-    psDB            *dbh,               ///< Database handle
-    const psMetadata *where,            ///< Row match criteria
-    unsigned long long limit            ///< Maximum number of elements to return
-);
-/** Deletes a row from the database coresponding to an detMasterImfile
- *
- *  Note that a 'where' search psMetadata is constructed from each object and
- *  used to find rows to delete.
- *
- * @return A The number of rows removed or a negative value on error
- */
-
-bool detMasterImfileDeleteObject(
-    psDB            *dbh,               ///< Database handle
-    const detMasterImfileRow *object    ///< Object to delete
-);
-/** Deletes up to limit rows from the database and returns the number of rows actually deleted. 
- *
- *  Note that a 'where' search psMetadata is constructed from each object and
- *  used to find rows to delete.
- *
- * @return A The number of rows removed or a negative value on error
- */
-
-long long detMasterImfileDeleteRowObjects(
-    psDB            *dbh,               ///< Database handle
-    const psArray   *objects,           ///< Array of objects to delete
-    unsigned long long limit            ///< Maximum number of elements to delete 
-);
-/** Formats and prints an array of detMasterImfileRow objects
- *
- * When mdcf is set the formated output is in psMetadataConfig
- * format, otherwise it is in a simple tabular format.
- *
- * @return true on success
- */
-
-bool detMasterImfilePrintObjects(
-    FILE            *stream,            ///< a stream
-    psArray         *objects,           ///< An array of detMasterImfileRow objects
-    bool            mdcf                ///< format as mdconfig or simple
-);
 /** detResidImfileRow data structure
  *
