Changeset 7036

Timestamp:

May 1, 2006, 4:14:28 PM (20 years ago)

Author:

jhoblitt

Message:

implement -define

File:

• trunk/ippTools/src/guidetool.c (modified) (4 diffs)

trunk/ippTools/src/guidetool.c

@@ -10 +10 @@
 static bool pendingMode(pxConfig *config);
 static bool defineMode(pxConfig *config);
-static p1PendingExpRow *rawScienceTop1PendingExp(rawScienceExpRow *raw);
+static p1PendingExpRow *rawScienceTop1PendingExp(pxConfig *config, rawScienceExpRow *raw);
 
 int main(int argc, char **argv)
@@ -42 +42 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    psArray *p1PendingExp = p1PendingExpSelectRowObjects(config->dbh, NULL, 0);
+    // return all p1PendingExp rows unless there CLI search options
+    psArray *p1PendingExp = p1PendingExpSelectRowObjects(
+        config->dbh,
+        config->where ? config->where : NULL,
+        0
+    );
     if (!p1PendingExp) {
         psError(PS_ERR_UNKNOWN, false, "no p1PendingExp found");
@@ -69 +74 @@
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
+    
+    // return all rawScienceExp rows unless there CLI search options
+    psArray *rawScienceExps = rawScienceExpSelectRowObjects(
+        config->dbh,
+        config->where ? config->where : NULL,
+        0
+    );
+
+    // insert the rawScienceExps into p1PendingExp
+    // XXX for the being we're going to skip checking for duplicate entries
+    // XXX this will have to implimented unless duplicate key insertion 
+    // XXX support is implimented in psDB
+    for (long i = 0; i < psArrayLength(rawScienceExps); i++) {
+        p1PendingExpRow * new = rawScienceTop1PendingExp(
+                                            config, rawScienceExps->data[i]);
+        if (!p1PendingExpInsertObject(config->dbh, new)) {
+            psError(PS_ERR_UNKNOWN, false, "dbh access failed");
+            return false; 
+        }
+        psFree(new);
+    }
 
     return true;
 }
 
-static p1PendingExpRow *rawScienceTop1PendingExp(rawScienceExpRow *raw)
+static p1PendingExpRow *rawScienceTop1PendingExp(pxConfig *config, rawScienceExpRow *raw)
 {
     return p1PendingExpRowAlloc(
@@ -82 +108 @@
 //        newExp->class,
         raw->imfiles,
-        "my filter",
-        "my stats",
-        "my recipe",
-        0xff // XXX calc version number
+        raw->filter,
+        raw->stats,
+        "my recipe",                    //recipe
+        0xff                            // XXX calc version number
     );
 }