Skip to content

Commit 5287b83

Browse files
committed
IRSA-5367 clean up and add comments for future reference.
1 parent 968e9b0 commit 5287b83

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/firefly/java/edu/caltech/ipac/astro/ibe/datasource/WiseIbeDataSource.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public IbeQueryParam makeQueryParam(Map<String, String> queryInfo) {
245245
}
246246
else if (sourceProductLevel == "3a") {
247247
String sourceSchema = getSchemaFromSourceId(sourceId);
248-
String ss = sourceSchema.toUpperCase();
248+
String ss = sourceSchema.replaceAll("-", "_").toUpperCase();
249249
String tt = sourceProductLevel.toUpperCase();
250250
DataProduct sourcedt = DataProduct.valueOf(ss + "_" + tt);
251251
String sourceTable = sourcedt.getSourceTable();
@@ -260,19 +260,18 @@ else if (sourceProductLevel == "3a") {
260260
}
261261
if (sourceProductLevel == "1b") {
262262
String sourceSpec = WISE + "." + wds.getSourceTable() + "(\"source_id\":\"" + refSourceId + "\")";
263-
//queryParam.setRefBy(sourceSpec);
263+
//queryParam.setRefBy(sourceSpec); commented out not using RefBy search,
264+
// getting the images with the sourceId identified scanId and frame_num only
264265
String scanId = refSourceId.trim().substring(0,6);
265266
String framNum = String.valueOf(Integer.parseInt(refSourceId.trim().substring(6,9)));
266267
String ref1B = "scan_id=" + "\'"+ scanId + "\'"+" AND " + "frame_num="+"\'"+framNum+"\'";
267-
//queryParam.setRefBy(sourceSpec+"&where="+ref1B);
268268
queryParam.setWhere(ref1B);
269269
} else if (sourceProductLevel == "3a") {
270270
String coaddId = refSourceId.trim().substring(0,13);
271271
DataProduct sourcedt = DataProduct.ALLSKY_4BAND_3A;
272272
String sourceTable = sourcedt.getSourceTable();
273273
String sourceSpec = WISE + "." + sourceTable + "(\"source_id\":\"" + refSourceId + "\")";
274-
String ref3A = "coadd_id="+"\'"+coaddId+"\'";
275-
//queryParam.setRefBy(sourceSpec+"&where=" + ref3A);
274+
String ref3A = "coadd_id="+"\'"+coaddId+"\'"; //get the images with the coadd_id given by the source_id
276275
queryParam.setWhere(ref3A);
277276
}
278277
}

0 commit comments

Comments
 (0)