src/hg/lib/chromGraphFactory.c 1.17

Index: src/hg/lib/chromGraphFactory.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/chromGraphFactory.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -B -U 4 -r1.16 -r1.17
--- src/hg/lib/chromGraphFactory.c	10 Feb 2009 00:47:47 -0000	1.16
+++ src/hg/lib/chromGraphFactory.c	24 Feb 2009 19:41:39 -0000	1.17
@@ -23,8 +23,9 @@
 
 #define illumina300Table "snpArrayIllumina300"
 #define illumina550Table "snpArrayIllumina550"
 #define illumina650Table "snpArrayIllumina650"
+#define illumina1MTable "snpArrayIllumina1M"
 
 #define agilentCgh244ATable "agilentCgh244a"
 
 typedef int (*Chopper)(char *line, char **cols, int maxCol);
@@ -313,8 +314,19 @@
     mtr->query = "select count(*) from %s where name='%s'";
     slAddHead(&list, mtr);
     }
 
+/* Illumina 1M recognizer */
+table = illumina1MTable;
+if (sqlTableExists(conn, table))
+    {
+    AllocVar(mtr);
+    mtr->type = cgfMarkerHumanHap1M;
+    mtr->table = table;
+    mtr->query = "select count(*) from %s where name='%s'";
+    slAddHead(&list, mtr);
+    }
+
 /* Agilent CGH 244A */
 table = agilentCgh244ATable;
 if (sqlTableExists(conn, table))
     {
@@ -800,8 +812,9 @@
       || sameString(markerType, cgfMarkerAffy6SV)
       || sameString(markerType, cgfMarkerHumanHap300)
       || sameString(markerType, cgfMarkerHumanHap550)
       || sameString(markerType, cgfMarkerHumanHap650)
+      || sameString(markerType, cgfMarkerHumanHap1M)
       || sameString(markerType, cgfMarkerAgilentCgh244A)
         )
     {
     char *table = "";
@@ -810,8 +823,9 @@
     if (sameString(markerType, cgfMarkerAffy6SV)) table = affy6SVTable;
     if (sameString(markerType, cgfMarkerHumanHap300)) table = illumina300Table;
     if (sameString(markerType, cgfMarkerHumanHap550)) table = illumina550Table;
     if (sameString(markerType, cgfMarkerHumanHap650)) table = illumina650Table;
+    if (sameString(markerType, cgfMarkerHumanHap1M)) table = illumina1MTable;
     if (sameString(markerType, cgfMarkerAgilentCgh244A)) table = agilentCgh244ATable;
     if (!sqlTableExists(conn, table))
         errAbort("Sorry, no data for %s on this assembly.",
 		markerType);
@@ -820,9 +834,9 @@
     	"select chrom,chromStart,name from %s", NULL, NULL, report);
     }
 else
     {
-    errAbort("Unknown identifier format.");
+    errAbort("Unknown identifier format. markerType=%s", markerType);
     }
 if (ok)
     return fileList;
 else