Changeset 11027

Timestamp:

Jan 10, 2007, 6:44:06 PM (19 years ago)

Author:

jhoblitt

Message:

VERSION 0.0.71

Location:

trunk/ippdb

Files:

• configure.ac (modified) (1 diff)
• src/ippdb.c (modified) (8 diffs)
• src/ippdb.h (modified) (3 diffs)
• tests/alloc.c (modified) (2 diffs)
• tests/insert.c (modified) (1 diff)
• tests/insertobject.c (modified) (1 diff)
• tests/metadatafromobject.c (modified) (2 diffs)
• tests/objectfrommetadata.c (modified) (2 diffs)

trunk/ippdb/configure.ac

@@ -7 +7 @@
 AC_PREREQ(2.59)
 
-AC_INIT([ippdb], [0.0.70], [pan-starrs.ifa.hawaii.edu])
+AC_INIT([ippdb], [0.0.71], [pan-starrs.ifa.hawaii.edu])
 AC_CONFIG_SRCDIR([ippdb.pc.in])
 

trunk/ippdb/src/ippdb.c

@@ -7764 +7764 @@
 static void p3PendingExpRowFree(p3PendingExpRow *object);
 
-p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_tag, psS32 p2_version, psS32 p3_version, const char *label)
+p3PendingExpRow *p3PendingExpRowAlloc(const char *exp_tag, psS32 p2_version, psS32 p3_version, const char *label, psS16 fault)
 {
     p3PendingExpRow *_object;
@@ -7775 +7775 @@
     _object->p3_version = p3_version;
     _object->label = psStringCopy(label);
+    _object->fault = fault;
 
     return _object;
@@ -7808 +7809 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, "NOT NULL", 0)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
+        psFree(md);
+        return false;
+    }
 
     bool status = psDBCreateTable(dbh, P3PENDINGEXP_TABLE_NAME, md);
@@ -7821 +7827 @@
 }
 
-bool p3PendingExpInsert(psDB * dbh, const char *exp_tag, psS32 p2_version, psS32 p3_version, const char *label)
+bool p3PendingExpInsert(psDB * dbh, const char *exp_tag, psS32 p2_version, psS32 p3_version, const char *label, psS16 fault)
 {
     psMetadata *md = psMetadataAlloc();
@@ -7841 +7847 @@
     if (!psMetadataAdd(md, PS_LIST_TAIL, "label", PS_DATA_STRING, NULL, label)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item label");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, fault)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
         psFree(md);
         return false;
@@ -7867 +7878 @@
 bool p3PendingExpInsertObject(psDB *dbh, p3PendingExpRow *object)
 {
-    return p3PendingExpInsert(dbh, object->exp_tag, object->p2_version, object->p3_version, object->label);
+    return p3PendingExpInsert(dbh, object->exp_tag, object->p2_version, object->p3_version, object->label, object->fault);
 }
 
@@ -7960 +7971 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "fault", PS_DATA_S16, NULL, object->fault)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
+        psFree(md);
+        return false;
+    }
 
 
@@ -7989 +8005 @@
         return false;
     }
-
-    return p3PendingExpRowAlloc(exp_tag, p2_version, p3_version, label);
+    psS16 fault = psMetadataLookupS16(&status, md, "fault");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item fault");
+        return false;
+    }
+
+    return p3PendingExpRowAlloc(exp_tag, p2_version, p3_version, label, fault);
 }
 psArray *p3PendingExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)

trunk/ippdb/src/ippdb.h

@@ -4005 +4005 @@
     psS32           p3_version;
     char            *label;
+    psS16           fault;
 } p3PendingExpRow;
 
@@ -4016 +4017 @@
     psS32           p2_version,
     psS32           p3_version,
-    const char      *label
+    const char      *label,
+    psS16           fault
 );
 
@@ -4049 +4051 @@
     psS32           p2_version,
     psS32           p3_version,
-    const char      *label
+    const char      *label,
+    psS16           fault
 );
 

trunk/ippdb/tests/alloc.c

@@ -787 +787 @@
         p3PendingExpRow *object;
 
-        object = p3PendingExpRowAlloc("a string", -32, -32, "a string"    );
+        object = p3PendingExpRowAlloc("a string", -32, -32, "a string", -16    );
 
         if (!object) {
@@ -806 +806 @@
         }
         if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
             psFree(object);
             exit(EXIT_FAILURE);

trunk/ippdb/tests/insert.c

@@ -283 +283 @@
         }
 
-        if (!p3PendingExpInsert(dbh, "a string", -32, -32, "a string")) {
+        if (!p3PendingExpInsert(dbh, "a string", -32, -32, "a string", -16)) {
             exit(EXIT_FAILURE);
         }

trunk/ippdb/tests/insertobject.c

@@ -410 +410 @@
         }
 
-        object = p3PendingExpRowAlloc("a string", -32, -32, "a string");
+        object = p3PendingExpRowAlloc("a string", -32, -32, "a string", -16);
         if (!object) {
             exit(EXIT_FAILURE);

trunk/ippdb/tests/metadatafromobject.c

@@ -933 +933 @@
         bool            status;
 
-        object = p3PendingExpRowAlloc("a string", -32, -32, "a string");
+        object = p3PendingExpRowAlloc("a string", -32, -32, "a string", -16);
         if (!object) {
             exit(EXIT_FAILURE);
@@ -958 +958 @@
         }
         if (strncmp(psMetadataLookupPtr(&status, md, "label"), "a string", MAX_STRING_LENGTH)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
             psFree(md);
             exit(EXIT_FAILURE);

trunk/ippdb/tests/objectfrommetadata.c

@@ -1437 +1437 @@
             exit(EXIT_FAILURE);
         }
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
 
         object = p3PendingExpObjectFromMetadata(md);
@@ -1459 +1462 @@
         }
         if (strncmp(object->label, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
             psFree(object);
             exit(EXIT_FAILURE);