Changeset 15582 for trunk/ippdb/src/ippdb.c

Timestamp:

Nov 9, 2007, 5:56:56 PM (19 years ago)

Author:

jhoblitt

Message:

foo

File:

• trunk/ippdb/src/ippdb.c (modified) (9 diffs)

trunk/ippdb/src/ippdb.c

@@ -23065 +23065 @@
 static void flatcorrExpRowFree(flatcorrExpRow *object);
 
-flatcorrExpRow *flatcorrExpRowAlloc(psS64 corr_id, psS64 chip_id, const char *state)
+flatcorrExpRow *flatcorrExpRowAlloc(psS64 corr_id, psS64 chip_id)
 {
     flatcorrExpRow  *_object;
@@ -23074 +23074 @@
     _object->corr_id = corr_id;
     _object->chip_id = chip_id;
-    _object->state = psStringCopy(state);
 
     return _object;
@@ -23081 +23080 @@
 static void flatcorrExpRowFree(flatcorrExpRow *object)
 {
-    psFree(object->state);
 }
 
@@ -23087 +23085 @@
 {
     psMetadata *md = psMetadataAlloc();
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "corr_id", PS_DATA_S64, "Primary Key", 0)) {
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "corr_id", PS_DATA_S64, "Primary Key fkey(corr_id) ref flatcorrRun(corr_id)", 0)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item corr_id");
         psFree(md);
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, "Primary Key", 64)) {
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, "Primary Key fkey(chip_id) ref chipRun(chip_id)", 64)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id");
         psFree(md);
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "state", PS_DATA_STRING, "fkey(corr_id) ref flatcorrRun(corr_id)", "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item state");
-        psFree(md);
-        return false;
-    }
 
     bool status = psDBCreateTable(dbh, FLATCORREXP_TABLE_NAME, md);
@@ -23115 +23108 @@
 }
 
-bool flatcorrExpInsert(psDB * dbh, psS64 corr_id, psS64 chip_id, const char *state)
+bool flatcorrExpInsert(psDB * dbh, psS64 corr_id, psS64 chip_id)
 {
     psMetadata *md = psMetadataAlloc();
@@ -23125 +23118 @@
     if (!psMetadataAdd(md, PS_LIST_TAIL, "chip_id", PS_DATA_S64, NULL, chip_id)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item chip_id");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "state", PS_DATA_STRING, NULL, state)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item state");
         psFree(md);
         return false;
@@ -23156 +23144 @@
 bool flatcorrExpInsertObject(psDB *dbh, flatcorrExpRow *object)
 {
-    return flatcorrExpInsert(dbh, object->corr_id, object->chip_id, object->state);
+    return flatcorrExpInsert(dbh, object->corr_id, object->chip_id);
 }
 
@@ -23239 +23227 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "state", PS_DATA_STRING, NULL, object->state)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item state");
-        psFree(md);
-        return false;
-    }
 
 
@@ -23263 +23246 @@
         return false;
     }
-    char* state = psMetadataLookupPtr(&status, md, "state");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item state");
-        return false;
-    }
-
-    return flatcorrExpRowAlloc(corr_id, chip_id, state);
+
+    return flatcorrExpRowAlloc(corr_id, chip_id);
 }
 psArray *flatcorrExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)