Changeset 19459

Timestamp:

Sep 10, 2008, 9:20:04 AM (18 years ago)

Author:

Paul Price

Message:

Add label search to difftool -todiffskyfile

Location:

trunk/ippTools

Files:

• share/difftool_todiffskyfile.sql (modified) (1 diff)
• src/difftool.c (modified) (2 diffs)
• src/difftoolConfig.c (modified) (1 diff)

trunk/ippTools/share/difftool_todiffskyfile.sql

@@ -4 +4 @@
     diffRun.skycell_id,
     diffRun.tess_id,
+    diffRun.label,
     rawExp.camera
 FROM diffRun

trunk/ippTools/src/difftool.c

@@ -394 +394 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where,  "-diff_id", "diff_id", "==");
+    PXOPT_COPY_S64(config->args, where,  "-diff_id", "diffRun.diff_id", "==");
+    PXOPT_COPY_STR(config->args, where,  "-label", "diffRun.label", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -406 +407 @@
 
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "diffSkyfile");
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);

trunk/ippTools/src/difftoolConfig.c

@@ -83 +83 @@
     psMetadata *todiffskyfileArgs = psMetadataAlloc();
     psMetadataAddS64(todiffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,            "search by diff ID", 0);
+    psMetadataAddStr(todiffskyfileArgs, PS_LIST_TAIL, "-label", 0, "search by label", 0);
     psMetadataAddU64(todiffskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     psMetadataAddBool(todiffskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);