Changeset 11088 for trunk/ippTools/src/dettool.c
- Timestamp:
- Jan 12, 2007, 4:38:53 PM (19 years ago)
- File:
-
- 1 edited
-
trunk/ippTools/src/dettool.c (modified) (40 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippTools/src/dettool.c
r11047 r11088 167 167 " WHERE" 168 168 " detInputExp.exp_tag IS NULL" 169 " AND rawExp.obstype != 'object'" 169 170 ); 170 171 … … 188 189 } 189 190 if (!psArrayLength(output)) { 190 // XXX check psError here191 191 psError(PS_ERR_UNKNOWN, false, "no pending rawExp rows found"); 192 192 psFree(output); … … 1717 1717 } 1718 1718 1719 // default values 1720 psS8 code = psMetadataLookupS8(&status, config->args, "-code"); 1721 if (!status) { 1722 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); 1723 return false; 1724 } 1725 1719 1726 psArray *rawImfiles = rawImfileSelectRowObjects(config->dbh, where, 0); 1720 1727 psFree(where); … … 1723 1730 return false; 1724 1731 } 1732 1725 1733 1726 1734 // create a new detProcessedImfile object … … 1735 1743 bg_mean_stdev, 1736 1744 b1_uri, 1737 b2_uri 1745 b2_uri, 1746 code 1738 1747 ); 1739 1748 psFree(rawImfiles); … … 1950 1959 } 1951 1960 1961 // default values 1962 psS8 code = psMetadataLookupS8(&status, config->args, "-code"); 1963 if (!status) { 1964 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); 1965 return false; 1966 } 1967 1952 1968 psString query = psStringCopy( 1953 1969 " SELECT DISTINCT" … … 2015 2031 bg_mean_stdev, 2016 2032 b1_uri, 2017 b2_uri 2033 b2_uri, 2034 code 2018 2035 ); 2019 2036 … … 2033 2050 { 2034 2051 PS_ASSERT_PTR_NON_NULL(config, false); 2052 2053 bool status = false; 2054 psU64 limit = psMetadataLookupU64(&status, config->args, "-limit"); 2055 if (!status) { 2056 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit"); 2057 return false; 2058 } 2059 2060 bool faulted = psMetadataLookupU64(&status, config->args, "-faulted"); 2061 if (!status) { 2062 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted"); 2063 return false; 2064 } 2035 2065 2036 2066 psString query = psStringCopy("SELECT * FROM detProcessedExp"); … … 2040 2070 psStringAppend(&query, " %s", whereClause); 2041 2071 psFree(whereClause); 2072 } 2073 2074 if (faulted) { 2075 // list only faulted rows 2076 psStringAppend(&query, " %s", "AND detProcessedExp.fault != 0"); 2077 } else { 2078 // don't list faulted rows 2079 psStringAppend(&query, " %s", "AND detProcessedExp.fault = 0"); 2080 } 2081 2082 // treat limit == 0 as "no limit" 2083 if (limit) { 2084 psString limitString = psDBGenerateLimitSQL(limit); 2085 psStringAppend(&query, " %s", limitString); 2086 psFree(limitString); 2042 2087 } 2043 2088 … … 2206 2251 PS_ASSERT_PTR_NON_NULL(config, false); 2207 2252 2253 bool status = false; 2254 psU64 limit = psMetadataLookupU64(&status, config->args, "-limit"); 2255 if (!status) { 2256 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit"); 2257 return false; 2258 } 2259 2260 bool faulted = psMetadataLookupU64(&status, config->args, "-faulted"); 2261 if (!status) { 2262 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted"); 2263 return false; 2264 } 2265 2208 2266 psString query = psStringCopy( 2209 2267 " SELECT DISTINCT" … … 2248 2306 psFree(query); 2249 2307 2308 if (faulted) { 2309 // list only faulted rows 2310 psStringAppend(&query, " %s", "AND detProcessedImfile.fault != 0"); 2311 } else { 2312 // don't list faulted rows 2313 psStringAppend(&query, " %s", "AND detProcessedImfile.fault = 0"); 2314 } 2315 2316 // treat limit == 0 as "no limit" 2317 if (limit) { 2318 psString limitString = psDBGenerateLimitSQL(limit); 2319 psStringAppend(&query, " %s", limitString); 2320 psFree(limitString); 2321 } 2322 2250 2323 psArray *output = p_psDBFetchResult(config->dbh); 2251 2324 if (!output) { … … 2352 2425 } 2353 2426 2354 // iteration has a default value2427 // default values 2355 2428 psS32 iteration = psMetadataLookupS32(&status, config->args, "-iteration"); 2356 2429 if (!status) { 2357 2430 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -iteration"); 2431 return false; 2432 } 2433 2434 psS8 code = psMetadataLookupS8(&status, config->args, "-code"); 2435 if (!status) { 2436 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); 2358 2437 return false; 2359 2438 } … … 2400 2479 bg, 2401 2480 bg_stdev, 2402 bg_mean_stdev 2481 bg_mean_stdev, 2482 code 2403 2483 ); 2404 2484 … … 2418 2498 { 2419 2499 PS_ASSERT_PTR_NON_NULL(config, false); 2500 2501 bool status = false; 2502 psU64 limit = psMetadataLookupU64(&status, config->args, "-limit"); 2503 if (!status) { 2504 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit"); 2505 return false; 2506 } 2507 2508 bool faulted = psMetadataLookupU64(&status, config->args, "-faulted"); 2509 if (!status) { 2510 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted"); 2511 return false; 2512 } 2420 2513 2421 2514 // select detStackedImfile.* … … 2438 2531 psStringAppend(&query, " AND %s", whereClause); 2439 2532 psFree(whereClause); 2533 } 2534 2535 if (faulted) { 2536 // list only faulted rows 2537 psStringAppend(&query, " %s", "AND detStackedImfile.fault != 0"); 2538 } else { 2539 // don't list faulted rows 2540 psStringAppend(&query, " %s", "AND detStackedImfile.fault = 0"); 2541 } 2542 2543 // treat limit == 0 as "no limit" 2544 if (limit) { 2545 psString limitString = psDBGenerateLimitSQL(limit); 2546 psStringAppend(&query, " %s", limitString); 2547 psFree(limitString); 2440 2548 } 2441 2549 … … 2708 2816 } 2709 2817 2818 // default values 2819 psS8 code = psMetadataLookupS8(&status, config->args, "-code"); 2820 if (!status) { 2821 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); 2822 return false; 2823 } 2824 2710 2825 return detNormalizedStatImfileRowAlloc( 2711 2826 stackedImfile->det_id, 2712 2827 stackedImfile->iteration, 2713 2828 stackedImfile->class_id, 2714 norm 2829 norm, 2830 code 2715 2831 ); 2716 2832 } … … 3104 3220 } 3105 3221 #endif 3106 3222 3107 3223 // treat limit == 0 as "no limit" 3108 3224 if (limit) { … … 3210 3326 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -iteration"); return false; 3211 3327 } 3328 3329 psS8 code = psMetadataLookupS8(&status, config->args, "-code"); 3330 if (!status) { 3331 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); 3332 return false; 3333 } 3334 3212 3335 // optional 3213 3336 psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri"); … … 3290 3413 bg_mean_stdev, 3291 3414 b1_uri, 3292 b2_uri 3415 b2_uri, 3416 code 3293 3417 ); 3294 3418 … … 3308 3432 { 3309 3433 PS_ASSERT_PTR_NON_NULL(config, false); 3434 3435 bool status = false; 3436 psU64 limit = psMetadataLookupU64(&status, config->args, "-limit"); 3437 if (!status) { 3438 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit"); 3439 return false; 3440 } 3441 3442 bool faulted = psMetadataLookupU64(&status, config->args, "-faulted"); 3443 if (!status) { 3444 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted"); 3445 return false; 3446 } 3310 3447 3311 3448 psString query = psStringCopy( … … 3326 3463 } 3327 3464 3465 if (faulted) { 3466 // list only faulted rows 3467 psStringAppend(&query, " %s", "AND detNormalizedExp.fault != 0"); 3468 } else { 3469 // don't list faulted rows 3470 psStringAppend(&query, " %s", "AND detNormalizedExp.fault = 0"); 3471 } 3472 3473 // treat limit == 0 as "no limit" 3474 if (limit) { 3475 psString limitString = psDBGenerateLimitSQL(limit); 3476 psStringAppend(&query, " %s", limitString); 3477 psFree(limitString); 3478 } 3479 3328 3480 if (!p_psDBRunQuery(config->dbh, query)) { 3329 3481 psError(PS_ERR_UNKNOWN, false, "database error"); … … 3418 3570 if (!status) { 3419 3571 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri"); 3572 return false; 3573 } 3574 3575 // default values 3576 psS8 code = psMetadataLookupS8(&status, config->args, "-code"); 3577 if (!status) { 3578 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); 3420 3579 return false; 3421 3580 } … … 3430 3589 bg_mean_stdev, 3431 3590 b1_uri, 3432 b2_uri 3591 b2_uri, 3592 code 3433 3593 ); 3434 3594 } … … 3581 3741 PS_ASSERT_PTR_NON_NULL(config, false); 3582 3742 3743 bool status = false; 3744 psU64 limit = psMetadataLookupU64(&status, config->args, "-limit"); 3745 if (!status) { 3746 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit"); 3747 return false; 3748 } 3749 3750 bool faulted = psMetadataLookupU64(&status, config->args, "-faulted"); 3751 if (!status) { 3752 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted"); 3753 return false; 3754 } 3755 3583 3756 psString query = psStringCopy( 3584 3757 "SELECT" … … 3602 3775 psStringAppend(&query, " AND %s", whereClause); 3603 3776 psFree(whereClause); 3777 } 3778 3779 if (faulted) { 3780 // list only faulted rows 3781 psStringAppend(&query, " %s", "AND detNormalizedImfile.fault != 0"); 3782 } else { 3783 // don't list faulted rows 3784 psStringAppend(&query, " %s", "AND detNormalizedImfile.fault = 0"); 3785 } 3786 3787 // treat limit == 0 as "no limit" 3788 if (limit) { 3789 psString limitString = psDBGenerateLimitSQL(limit); 3790 psStringAppend(&query, " %s", limitString); 3791 psFree(limitString); 3604 3792 } 3605 3793 … … 3685 3873 " 0.0 as bg_mean_stdev,\n" 3686 3874 " 'NULL' as b1_uri,\n" 3687 " 'NULL' as b2_uri\n" 3875 " 'NULL' as b2_uri,\n" 3876 " 0 as fault\n" 3688 3877 " FROM detRun\n" 3689 3878 " JOIN detInputExp\n" … … 3915 4104 } 3916 4105 4106 // default values 4107 psS8 code = psMetadataLookupS8(&status, config->args, "-code"); 4108 if (!status) { 4109 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); 4110 return false; 4111 } 4112 3917 4113 // create a new detResidImfileRow and insert it 3918 4114 return detResidImfileRowAlloc( … … 3927 4123 bg_mean_stdev, 3928 4124 b1_uri, 3929 b2_uri 4125 b2_uri, 4126 code 3930 4127 ); 3931 4128 } … … 3934 4131 { 3935 4132 PS_ASSERT_PTR_NON_NULL(config, false); 4133 4134 bool status = false; 4135 psU64 limit = psMetadataLookupU64(&status, config->args, "-limit"); 4136 if (!status) { 4137 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit"); 4138 return false; 4139 } 4140 4141 bool faulted = psMetadataLookupU64(&status, config->args, "-faulted"); 4142 if (!status) { 4143 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted"); 4144 return false; 4145 } 3936 4146 3937 4147 // select detResidImfile.* … … 3955 4165 psStringAppend(&query, " AND %s", whereClause); 3956 4166 psFree(whereClause); 4167 } 4168 4169 if (faulted) { 4170 // list only faulted rows 4171 psStringAppend(&query, " %s", "AND p2ProcessedImfile.fault != 0"); 4172 } else { 4173 // don't list faulted rows 4174 psStringAppend(&query, " %s", "AND p2ProcessedImfile.fault = 0"); 4175 } 4176 4177 // treat limit == 0 as "no limit" 4178 if (limit) { 4179 psString limitString = psDBGenerateLimitSQL(limit); 4180 psStringAppend(&query, " %s", limitString); 4181 psFree(limitString); 3957 4182 } 3958 4183 … … 4409 4634 return false; 4410 4635 } 4636 // default values 4637 psS8 code = psMetadataLookupS8(&status, config->args, "-code"); 4638 if (!status) { 4639 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); 4640 return false; 4641 } 4411 4642 4412 4643 // create a new detResidImfileRow and insert it … … 4421 4652 b1_uri, 4422 4653 b2_uri, 4423 !reject 4654 !reject, 4655 code 4424 4656 ); 4425 4657 } … … 4428 4660 { 4429 4661 PS_ASSERT_PTR_NON_NULL(config, false); 4662 4663 bool status = false; 4664 psU64 limit = psMetadataLookupU64(&status, config->args, "-limit"); 4665 if (!status) { 4666 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit"); 4667 return false; 4668 } 4669 4670 bool faulted = psMetadataLookupU64(&status, config->args, "-faulted"); 4671 if (!status) { 4672 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted"); 4673 return false; 4674 } 4430 4675 4431 4676 psString query = psStringCopy( … … 4447 4692 psStringAppend(&query, " AND %s", whereClause); 4448 4693 psFree(whereClause); 4694 } 4695 4696 if (faulted) { 4697 // list only faulted rows 4698 psStringAppend(&query, " %s", "AND detResidExp.fault != 0"); 4699 } else { 4700 // don't list faulted rows 4701 psStringAppend(&query, " %s", "AND detResidExp.fault = 0"); 4702 } 4703 4704 // treat limit == 0 as "no limit" 4705 if (limit) { 4706 psString limitString = psDBGenerateLimitSQL(limit); 4707 psStringAppend(&query, " %s", limitString); 4708 psFree(limitString); 4449 4709 } 4450 4710 … … 4972 5232 return NULL; 4973 5233 } 5234 // default values 5235 psS8 code = psMetadataLookupS8(&status, config->args, "-code"); 5236 if (!status) { 5237 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code"); 5238 return false; 5239 } 4974 5240 4975 5241 return detRunSummaryRowAlloc( … … 4979 5245 bg_stdev, 4980 5246 bg_mean_stdev, 4981 accept 5247 accept, 5248 code 4982 5249 ); 4983 5250 } … … 4986 5253 { 4987 5254 PS_ASSERT_PTR_NON_NULL(config, false); 5255 5256 bool status = false; 5257 psU64 limit = psMetadataLookupU64(&status, config->args, "-limit"); 5258 if (!status) { 5259 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit"); 5260 return false; 5261 } 5262 5263 bool faulted = psMetadataLookupU64(&status, config->args, "-faulted"); 5264 if (!status) { 5265 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted"); 5266 return false; 5267 } 4988 5268 4989 5269 psString query = psStringCopy( … … 5003 5283 psStringAppend(&query, " AND %s", whereClause); 5004 5284 psFree(whereClause); 5285 } 5286 5287 if (faulted) { 5288 // list only faulted rows 5289 psStringAppend(&query, " %s", "AND p2ProcessedImfile.fault != 0"); 5290 } else { 5291 // don't list faulted rows 5292 psStringAppend(&query, " %s", "AND p2ProcessedImfile.fault = 0"); 5293 } 5294 5295 // treat limit == 0 as "no limit" 5296 if (limit) { 5297 psString limitString = psDBGenerateLimitSQL(limit); 5298 psStringAppend(&query, " %s", limitString); 5299 psFree(limitString); 5005 5300 } 5006 5301 … … 5564 5859 bg_stdev, 5565 5860 bg_mean_stdev, 5566 true // accept 5861 true, // accept 5862 0 // fault code 5567 5863 )) { 5568 5864 psError(PS_ERR_UNKNOWN, false, "database error"); … … 5662 5958 bg_mean_stdev, 5663 5959 b1_uri, 5664 b2_uri 5960 b2_uri, 5961 0 // fault code 5665 5962 )) { 5666 5963 psError(PS_ERR_UNKNOWN, false, "database error");
Note:
See TracChangeset
for help on using the changeset viewer.
