Changeset 18595 for trunk/ippdb/src/ippdb.h

Timestamp:

Jul 17, 2008, 10:15:51 AM (18 years ago)

Author:

eugene

Message:

updates to magictool and pstamp

File:

• trunk/ippdb/src/ippdb.h (modified) (19 diffs)

trunk/ippdb/src/ippdb.h

@@ -6123 +6123 @@
     char            *skycell_id;
     char            *tess_id;
+    char            *filter;
 } stackRunRow;
 
@@ -6137 +6138 @@
     psTime*         registered,
     const char      *skycell_id,
-    const char      *tess_id
+    const char      *tess_id,
+    const char      *filter
 );
 
@@ -6173 +6175 @@
     psTime*         registered,
     const char      *skycell_id,
-    const char      *tess_id
+    const char      *tess_id,
+    const char      *filter
 );
 
@@ -10032 +10035 @@
     char            *dvodb;
     psTime*         registered;
+    psS16           fault;
 } magicRunRow;
 
@@ -10046 +10050 @@
     const char      *label,
     const char      *dvodb,
-    psTime*         registered
+    psTime*         registered,
+    psS16           fault
 );
 
@@ -10082 +10087 @@
     const char      *label,
     const char      *dvodb,
-    psTime*         registered
+    psTime*         registered,
+    psS16           fault
 );
 
@@ -10643 +10649 @@
     char            *node;
     char            *uri;
+    psS16           fault;
 } magicNodeResultRow;
 
@@ -10653 +10660 @@
     psS64           magic_id,
     const char      *node,
-    const char      *uri
+    const char      *uri,
+    psS16           fault
 );
 
@@ -10685 +10693 @@
     psS64           magic_id,
     const char      *node,
-    const char      *uri
+    const char      *uri,
+    psS16           fault
 );
 
@@ -10843 +10852 @@
     psS64           magic_id;
     char            *uri;
+    psS32           streaks;
+    psS16           fault;
 } magicMaskRow;
 
@@ -10852 +10863 @@
 magicMaskRow *magicMaskRowAlloc(
     psS64           magic_id,
-    const char      *uri
+    const char      *uri,
+    psS32           streaks,
+    psS16           fault
 );
 
@@ -10883 +10896 @@
     psDB            *dbh,               ///< Database handle
     psS64           magic_id,
-    const char      *uri
+    const char      *uri,
+    psS32           streaks,
+    psS16           fault
 );
 
@@ -11031 +11046 @@
     FILE            *stream,            ///< a stream
     magicMaskRow *object,    ///< an magicMaskRow object
-    bool            mdcf                ///< format as mdconfig or simple
-);
-/** magicSkyfileMaskRow data structure
- *
- * Structure for representing a single row of magicSkyfileMask table data.
- */
-
-typedef struct {
-    psS64           magic_id;
-    psS64           diff_id;
-    char            *uri;
-} magicSkyfileMaskRow;
-
-/** Creates a new magicSkyfileMaskRow object
- *
- *  @return A new magicSkyfileMaskRow object or NULL on failure.
- */
-
-magicSkyfileMaskRow *magicSkyfileMaskRowAlloc(
-    psS64           magic_id,
-    psS64           diff_id,
-    const char      *uri
-);
-
-/** Creates a new magicSkyfileMask table
- *
- * @return true on success
- */
-
-bool magicSkyfileMaskCreateTable(
-    psDB            *dbh                ///< Database handle
-);
-
-/** Deletes a magicSkyfileMask table
- *
- * @return true on success
- */
-
-bool magicSkyfileMaskDropTable(
-    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 magicSkyfileMaskInsert(
-    psDB            *dbh,               ///< Database handle
-    psS64           magic_id,
-    psS64           diff_id,
-    const char      *uri
-);
-
-/** 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 magicSkyfileMaskDelete(
-    psDB            *dbh,               ///< Database handle
-    const psMetadata *where,            ///< Row match criteria
-    unsigned long long limit            ///< Maximum number of elements to delete 
-);
-
-/** Insert a single magicSkyfileMaskRow object into a table
- *
- * This function constructs and inserts a single row based on it's parameters.
- *
- * @return true on success
- */
-
-bool magicSkyfileMaskInsertObject(
-    psDB            *dbh,               ///< Database handle
-    magicSkyfileMaskRow *object             ///< magicSkyfileMaskRow object
-);
-
-/** Insert an array of magicSkyfileMaskRow object into a table
- *
- * This function constructs and inserts multiple rows based on it's parameters.
- *
- * @return true on success
- */
-
-bool magicSkyfileMaskInsertObjects(
-    psDB            *dbh,               ///< Database handle
-    psArray         *objects            ///< array of magicSkyfileMaskRow objects
-);
-
-/** Insert data from a binary FITS table magicSkyfileMaskRow 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 magicSkyfileMaskInsertFits(
-    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 magicSkyfileMaskSelectRowsFits(
-    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 magicSkyfileMaskRow into an equivalent psMetadata
- *
- * @return A psMetadata pointer or NULL on error
- */
-
-psMetadata *magicSkyfileMaskMetadataFromObject(
-    const magicSkyfileMaskRow *object             ///< fooRow to convert into a psMetadata
-);
-
-/** Convert a psMetadata into an equivalent fooRow
- *
- * @return A magicSkyfileMaskRow pointer or NULL on error
- */
-
-magicSkyfileMaskRow *magicSkyfileMaskObjectFromMetadata(
-    psMetadata      *md                 ///< psMetadata to convert into a fooRow
-);
-/** Selects up to limit rows from the database and returns as magicSkyfileMaskRow objects in a psArray
- *
- *  See psDBSelectRows() for documentation on the format of where.
- *
- * @return A psArray pointer or NULL on error
- */
-
-psArray *magicSkyfileMaskSelectRowObjects(
-    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 magicSkyfileMask
- *
- *  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 magicSkyfileMaskDeleteObject(
-    psDB            *dbh,               ///< Database handle
-    const magicSkyfileMaskRow *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 magicSkyfileMaskDeleteRowObjects(
-    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 magicSkyfileMaskRow 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 magicSkyfileMaskPrintObjects(
-    FILE            *stream,            ///< a stream
-    psArray         *objects,           ///< An array of magicSkyfileMaskRow objects
-    bool            mdcf                ///< format as mdconfig or simple
-);
-/** Formats and prints an magicSkyfileMaskRow object
- *
- * When mdcf is set the formated output is in psMetadataConfig
- * format, otherwise it is in a simple tabular format.
- *
- * @return true on success
- */
-
-bool magicSkyfileMaskPrintObject(
-    FILE            *stream,            ///< a stream
-    magicSkyfileMaskRow *object,    ///< an magicSkyfileMaskRow object
     bool            mdcf                ///< format as mdconfig or simple
 );
@@ -12269 +12083 @@
     psS64           ds_id;
     char            *state;
-    char            *outFileset;
+    char            *name;
+    char            *reqType;
+    char            *outProduct;
     char            *uri;
-    psS16           resultsFile;
+    psS32           fault;
 } pstampRequestRow;
 
@@ -12283 +12099 @@
     psS64           ds_id,
     const char      *state,
-    const char      *outFileset,
+    const char      *name,
+    const char      *reqType,
+    const char      *outProduct,
     const char      *uri,
-    psS16           resultsFile
+    psS32           fault
 );
 
@@ -12318 +12136 @@
     psS64           ds_id,
     const char      *state,
-    const char      *outFileset,
+    const char      *name,
+    const char      *reqType,
+    const char      *outProduct,
     const char      *uri,
-    psS16           resultsFile
+    psS32           fault
 );
 
@@ -12478 +12298 @@
     psS64           job_id;
     psS64           req_id;
+    char            *rownum;
     char            *state;
     char            *jobType;
-    psS32           result;
+    psS32           fault;
     char            *uri;
     char            *outputBase;
@@ -12494 +12315 @@
     psS64           job_id,
     psS64           req_id,
+    const char      *rownum,
     const char      *state,
     const char      *jobType,
-    psS32           result,
+    psS32           fault,
     const char      *uri,
     const char      *outputBase,
@@ -12531 +12353 @@
     psS64           job_id,
     psS64           req_id,
+    const char      *rownum,
     const char      *state,
     const char      *jobType,
-    psS32           result,
+    psS32           fault,
     const char      *uri,
     const char      *outputBase,