Changeset 27840 for branches/simtest_nebulous_branches/ippTools/src/pxfake.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/pxfake.c (modified) (4 diffs)

branches/simtest_nebulous_branches/ippTools/src

@@ +1 @@
+*.la
+*.lo
 .deps
 .gdb_history
@@ -4 +6 @@
 Makefile
 Makefile.in
+addtool
+caltool
+camtool
+chiptool
 config.h
 config.h.in
-stamp-h1
-*.la
-*.lo
+detselect
+dettool
+difftool
+disttool
+dqstatstool
+faketool
+flatcorr
+guidetool
+magicdstool
+magictool
+pstamptool
+pubtool
+pxadmin
+pxdata.c
+pxinject
 pxtoolsErrorCodes.c
 pxtoolsErrorCodes.h
-pxadmin
-pxinject
-pztool
 pzgetexp
 pzgetimfiles
+pztool
+receivetool
 regtool
-guidetool
-chiptool
-camtool
+stacktool
+stamp-h1
 warptool
-difftool
-stacktool
-faketool
-dettool
-detselect
-pxdata.c
-magictool
-magicdstool
-caltool
-flatcorr
-pstamptool
-disttool
-receivetool
-
-pubtool

@@ +1 @@
+*.la
+*.lo
 .deps
 .gdb_history
@@ -4 +6 @@
 Makefile
 Makefile.in
+addtool
+caltool
+camtool
+chiptool
 config.h
 config.h.in
-stamp-h1
-*.la
-*.lo
+detselect
+dettool
+difftool
+disttool
+dqstatstool
+faketool
+flatcorr
+guidetool
+magicdstool
+magictool
+pstamptool
+pubtool
+pxadmin
+pxdata.c
+pxinject
 pxtoolsErrorCodes.c
 pxtoolsErrorCodes.h
-pxadmin
-pxinject
-pztool
 pzgetexp
 pzgetimfiles
+pztool
+receivetool
 regtool
-guidetool
-chiptool
-camtool
+stacktool
+stamp-h1
 warptool
-difftool
-stacktool
-faketool
-dettool
-detselect
-pxdata.c
-magictool
-magicdstool
-caltool
-flatcorr
-pstamptool
-disttool
-receivetool
-
-pubtool

branches/simtest_nebulous_branches/ippTools/src/pxfake.c

@@ -51 +51 @@
 }
 
-
-bool pxfakeRunSetStateByQuery(pxConfig *config, psMetadata *where, const char *state)
-{
-    PS_ASSERT_PTR_NON_NULL(config, false);
-    PS_ASSERT_PTR_NON_NULL(state, false);
-
-    // check that state is a valid string value
-    if (!pxIsValidState(state)) {
-        psError(PS_ERR_UNKNOWN, false,
-                "invalid fakeRun state: %s", state);
-        return false;
-    }
-
-    psString query = psStringCopy("UPDATE fakeRun JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) SET fakeRun.state = '%s'");
-
-    if (where) {
-        psString whereClause = psDBGenerateWhereSQL(where, NULL);
-        psStringAppend(&query, " %s", whereClause);
-        psFree(whereClause);
-    }
-
-    if (!p_psDBRunQueryF(config->dbh, query, state)) {
-        psFree(query);
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-
-    psFree(query);
-
-    return true;
-}
-
-
-bool pxfakeRunSetLabel(pxConfig *config, psS64 fake_id, const char *label)
-{
-    PS_ASSERT_PTR_NON_NULL(config, false);
-    // note label == NULL should be explicitly allowed
-
-    char *query = "UPDATE fakeRun SET fakeRun.label = '%s' WHERE fake_id = %" PRId64;
-    if (!p_psDBRunQueryF(config->dbh, query, label, fake_id)) {
-        psError(PS_ERR_UNKNOWN, false,
-                "failed to change state for fake_id %" PRId64, fake_id);
-        return false;
-    }
-
-    return true;
-}
-
-
-bool pxfakeRunSetLabelByQuery(pxConfig *config, psMetadata *where, const char *label)
-{
-    PS_ASSERT_PTR_NON_NULL(config, false);
-    // note label == NULL should be explicitly allowed
-
-    psString query = psStringCopy("UPDATE fakeRun JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) SET fakeRun.label = '%s'");
-
-    if (where) {
-        psString whereClause = psDBGenerateWhereSQL(where, NULL);
-        psStringAppend(&query, " %s", whereClause);
-        psFree(whereClause);
-    }
-
-    if (!p_psDBRunQueryF(config->dbh, query, label)) {
-        psFree(query);
-        psError(PS_ERR_UNKNOWN, false, "database error");
-        return false;
-    }
-
-    psFree(query);
-
-    return true;
-}
-
-
 psS64 pxfakeQueueByCamID(pxConfig *config,
                     psS64 cam_id,
                     char *workdir,
                     char *label,
+                    char *data_group,
+                    char *dist_group,
                     char *reduction,
                     char *expgroup,
                     char *dvodb,
                     char *tess_id,
-                    char *end_stage)
+                    char *end_stage,
+                    char *note)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -145 +74 @@
         psMemSetPersistent(query, true);
         if (!query) {
-            psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+            psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
             return false;
         }
@@ -157 +86 @@
                 workdir  ? workdir  : "NULL",
                 label    ? label    : "NULL",
+                data_group ? data_group : "NULL",
+                dist_group ? dist_group : "NULL",
                 reduction? reduction: "NULL",
                 expgroup ? expgroup : "NULL",
@@ -162 +93 @@
                 tess_id  ? tess_id  : "NULL",
                 end_stage ? end_stage : "NULL",
+                note     ? note     : "NULL",
                 (long long)cam_id
     )) {

@@ +1 @@
+*.la
+*.lo
 .deps
 .gdb_history
@@ -4 +6 @@
 Makefile
 Makefile.in
+addtool
+caltool
+camtool
+chiptool
 config.h
 config.h.in
-stamp-h1
-*.la
-*.lo
+detselect
+dettool
+difftool
+disttool
+dqstatstool
+faketool
+flatcorr
+guidetool
+magicdstool
+magictool
+pstamptool
+pubtool
+pxadmin
+pxdata.c
+pxinject
 pxtoolsErrorCodes.c
 pxtoolsErrorCodes.h
-pxadmin
-pxinject
-pztool
 pzgetexp
 pzgetimfiles
+pztool
+receivetool
 regtool
-guidetool
-chiptool
-camtool
+stacktool
+stamp-h1
 warptool
-difftool
-stacktool
-faketool
-dettool
-detselect
-pxdata.c
-magictool
-magicdstool
-caltool
-flatcorr
-pstamptool
-disttool
-receivetool
-
-pubtool