Changeset 8665 for trunk/ippdb/tests/pop.c

Timestamp:

Aug 28, 2006, 6:44:34 PM (20 years ago)

Author:

jhoblitt

Message:

VERSION 0.0.34

File:

• trunk/ippdb/tests/pop.c (modified) (4 diffs)

trunk/ippdb/tests/pop.c

@@ -433 +433 @@
         psDB            *dbh;
         char            exp_id[256];
-        char            recipe[256];
         psS32           p1_version;
         psS32           p2_version;
@@ -442 +441 @@
         }
 
-        if (!p2DoneExpPop(dbh, (char **)&exp_id, (char **)&recipe, &p1_version, &p2_version)) { 
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-        char            exp_id[256];
-        char            class_id[256];
-        char            uri[256];
-        char            recipe[256];
+        if (!p2ProcessedExpPop(dbh, (char **)&exp_id, &p1_version, &p2_version)) { 
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+        char            exp_id[256];
+        char            class_id[256];
+        char            uri[256];
+        char            recipe[256];
+        psF64           bg;
+        psF64           bg_stdev;
+        psF64           bg_mean_stdev;
+        char            b1_uri[256];
+        char            b2_uri[256];
         psS32           p1_version;
         psS32           p2_version;
@@ -463 +467 @@
         }
 
-        if (!p2DoneImfilePop(dbh, (char **)&exp_id, (char **)&class_id, (char **)&uri, (char **)&recipe, &p1_version, &p2_version)) { 
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-        char            exp_id[256];
-        char            recipe[256];
+        if (!p2ProcessedImfilePop(dbh, (char **)&exp_id, (char **)&class_id, (char **)&uri, (char **)&recipe, &bg, &bg_stdev, &bg_mean_stdev, (char **)&b1_uri, (char **)&b2_uri, &p1_version, &p2_version)) { 
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+        char            exp_id[256];
         psS32           p2_version;
         psS32           p3_version;
@@ -482 +485 @@
         }
 
-        if (!p3PendingExpPop(dbh, (char **)&exp_id, (char **)&recipe, &p2_version, &p3_version)) { 
+        if (!p3PendingExpPop(dbh, (char **)&exp_id, &p2_version, &p3_version)) { 
             exit(EXIT_FAILURE);
         }