Changeset 14037

Timestamp:

Jul 5, 2007, 5:46:11 PM (19 years ago)

Author:

jhoblitt

Message:

remove newExp.imfils

Location:

trunk/ippTools

Files:

• scripts/regtest.sh (modified) (3 diffs)
• share/regtool_pendingexp.sql (modified) (2 diffs)
• src/pxinject.c (modified) (2 diffs)
• src/pxinjectConfig.c (modified) (2 diffs)

trunk/ippTools/scripts/regtest.sh

@@ -8 +8 @@
 echo -e "YES\nipp\n\n" | pxadmin -recreate || exit 1
 
-exp_id1=`$inject -newExp -tmp_exp_name t10 -tmp_inst gpc -tmp_telescope ps1 -imfiles 4 -workdir file::///some/path -simple` || exit 1
+exp_id1=`$inject -newExp -tmp_exp_name t10 -tmp_inst gpc -tmp_telescope ps1 -workdir file::///some/path -simple` || exit 1
 
 for ID in `seq 0 3`; do
@@ -16 +16 @@
 $inject -updatenewExp -exp_id $exp_id1 -state run
 
-exp_id2=`$inject -newExp -tmp_exp_name t11 -tmp_inst gpc -tmp_telescope ps1 -imfiles 4 -workdir file::///some/path -simple` || exit 1
+exp_id2=`$inject -newExp -tmp_exp_name t11 -tmp_inst gpc -tmp_telescope ps1 -workdir file::///some/path -simple` || exit 1
 
 for ID in `seq 0 3`; do
@@ -23 +23 @@
 
 $inject -updatenewExp -exp_id $exp_id2 -state run
+
 
 $regtool -pendingimfile || exit 1

trunk/ippTools/share/regtool_pendingexp.sql

@@ -1 +1 @@
 SELECT DISTINCT * FROM
     (SELECT
-       newExp.*
+       newExp.*,
+       newImfile.tmp_class_id,
+       rawImfile.tmp_class_id as raw_tmp_class_id
     FROM newExp
     JOIN newImfile
@@ -7 +9 @@
     LEFT JOIN rawExp
        USING(exp_id)
+    LEFT JOIN rawImfile
+        ON newImfile.exp_id = rawImfile.exp_id
+        AND newImfile.tmp_class_id = rawImfile.tmp_class_id
     WHERE
         newExp.state = 'run'
         AND rawExp.exp_id IS NULL
-        AND newExp.imfiles =
-        (SELECT COUNT(exp_id) FROM rawImfile
-            WHERE rawImfile.exp_id = newExp.exp_id)) as Foo
+    GROUP BY
+        newExp.exp_id
+    HAVING
+        COUNT(newImfile.tmp_class_id) = COUNT(rawImfile.tmp_class_id)
+    ) as Foo

trunk/ippTools/src/pxinject.c

@@ -107 +107 @@
         return false;
     }
-    psS32 imfiles = psMetadataLookupS32(&status, config->args, "-imfiles");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -imfiles");
-        return false;
-    }
-    if (!imfiles) {
-        psError(PS_ERR_UNKNOWN, true, "-imfiles is required");
-        return false;
-    }
 
     psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
@@ -130 +121 @@
                 0x0, // exp_id
                 tmp_exp_name,
-                "reg", // state
                 tmp_camera,
                 tmp_telescope,
-                imfiles,
+                "reg", // state
                 workdir,
                 "dirty"

trunk/ippTools/src/pxinjectConfig.c

@@ -51 +51 @@
     psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-tmp_telescope",  0,
             "define the telescope name (required)", NULL);
-    psMetadataAddS32(newExpArgs, PS_LIST_TAIL, "-imfiles",  0,
-            "define the number of imfiles in this exp (required)", 0);
     psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-workdir",  0,
             "define workdir (required)", 0);
@@ -62 +60 @@
     psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-exp_id",  0,
             "define the exp_id (required)", NULL);
-#if 0
-    psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-class",  0,
-            "define the class (required)", NULL);
-#endif
     psMetadataAddStr(newImfileArgs, PS_LIST_TAIL, "-tmp_class_id",  0,
             "define the class ID (required)", NULL);