Changeset 18561 for trunk/ippTools/src/detselectConfig.c

Timestamp:

Jul 15, 2008, 10:30:59 AM (18 years ago)

Author:

eugene

Message:

completely deprecate config->where; make all command-line handling consistent; move nearly all sql into share/*.sql; ensure consistency between args supplied and used

File:

• trunk/ippTools/src/detselectConfig.c (modified) (2 diffs)

trunk/ippTools/src/detselectConfig.c

@@ -46 +46 @@
     // -search
     psMetadata *searchArgs = psMetadataAlloc();
-    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-inst", 0,
-                     "search by camera", NULL);
-    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-telescope", 0,
-                     "search by telescope", NULL);
-    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-det_type", 0,
-                     "search by detrend type", NULL);
-    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-type", 0,
-                     "search by detrend type (alias for -det_type)", NULL);
-    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-filter", 0,
-                     "search by filter", NULL);
-    psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-airmass", 0,
-                     "define airmass", NAN);
-    psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-exp_time", 0,
-                     "search by exposure time", NAN);
-    psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-ccd_temp", 0,
-                     "search by ccd tempature", NAN);
-    psMetadataAddF64(searchArgs, PS_LIST_TAIL, "-posang", 0,
-                     "search by rotator position angle", NAN);
-    psMetadataAddTime(searchArgs, PS_LIST_TAIL, "-time", 0,
-                      "define time for desired detrend data", NULL);
-    psMetadataAddBool(searchArgs, PS_LIST_TAIL, "-simple",  0,
-                      "use the simple output format", false);
-    psMetadataAddBool(searchArgs, PS_LIST_TAIL, "-unlimit",  0,
-                      "list all possible detruns, not just the best match", false);
+    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-inst", 0,                     "search by camera", NULL);
+    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-telescope", 0,                     "search by telescope", NULL);
+    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-det_type", 0,                     "search by detrend type", NULL);
+    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-type", 0,                     "search by detrend type (alias for -det_type)", NULL);
+    psMetadataAddStr(searchArgs, PS_LIST_TAIL, "-filter", 0,                     "search by filter", NULL);
+    psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-airmass", 0,                     "define airmass", NAN);
+    psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-exp_time", 0,                     "search by exposure time", NAN);
+    psMetadataAddF32(searchArgs, PS_LIST_TAIL, "-ccd_temp", 0,                     "search by ccd tempature", NAN);
+    psMetadataAddF64(searchArgs, PS_LIST_TAIL, "-posang", 0,                     "search by rotator position angle", NAN);
+    psMetadataAddTime(searchArgs, PS_LIST_TAIL, "-time", 0,                      "define time for desired detrend data", NULL);
+    psMetadataAddBool(searchArgs, PS_LIST_TAIL, "-simple",  0,                      "use the simple output format", false);
+    psMetadataAddBool(searchArgs, PS_LIST_TAIL, "-unlimit",  0,                      "list all possible detruns, not just the best match", false);
  
     // -select
     psMetadata *selectArgs = psMetadataAlloc();
-    psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-det_id", 0,
-                     "search by detrend ID", NULL);
-    psMetadataAddS32(selectArgs, PS_LIST_TAIL, "-iteration", 0,
-                     "search by iteration number", 0);
-    psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-class_id", 0,
-                     "search by class ID", NULL);
-    psMetadataAddBool(selectArgs, PS_LIST_TAIL, "-simple",  0,
-                      "use the simple output format", false);
+    psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-det_id", 0,                     "search by detrend ID", NULL);
+    psMetadataAddS32(selectArgs, PS_LIST_TAIL, "-iteration", 0,                     "search by iteration number", 0);
+    psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-class_id", 0,                     "search by class ID", NULL);
+    psMetadataAddBool(selectArgs, PS_LIST_TAIL, "-simple",  0,                      "use the simple output format", false);
     
     psMetadata *argSets = psMetadataAlloc();
@@ -99 +83 @@
     psFree(modes);
 
-    // setup search criterion
-    // generate SQL where clause
-    config->where = psMetadataAlloc();
-
-    addWhereStr(det_id);
-    addWhereS32(iteration);
-    addWhereStr(exp_id);
-    addWhereStrAlias(inst,camera);
-
-    addWhereStr(telescope);
-    addWhereStr(det_type);
-    addWhereStrAlias(type,det_type);
-
-    addWhereStr(exp_type);
-    addWhereS32(imfiles);
-    addWhereStr(class);
-    addWhereStr(class_id);
-    addWhereStr(filter);
-
-    //    addWhereF32(exp_time);
-    //    addWhereF64(ccd_temp);
-    //    addWhereF32(airmass);
-    //    addWhereTimeStr(use_begin);
-    //    addWhereTimeStr(use_end);
-
-    if (config->where->list->n < 1) {
-        psFree(config->where);
-        config->where = NULL;
-    }
-
-
     // define Database handle, if used
     config->dbh = psMemIncrRefCounter(pmConfigDB(config->modules));