src/hg/instinct/raToDb/raToDb.c 1.12

Index: src/hg/instinct/raToDb/raToDb.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/raToDb/raToDb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -B -U 4 -r1.11 -r1.12
--- src/hg/instinct/raToDb/raToDb.c	23 Apr 2010 19:43:06 -0000	1.11
+++ src/hg/instinct/raToDb/raToDb.c	26 May 2010 21:27:23 -0000	1.12
@@ -62,8 +62,9 @@
 dyStringPrintf(dy, "height int unsigned,\n");
 dyStringPrintf(dy, "groupName varchar(255),\n");
 dyStringPrintf(dy, "raFile varchar(255),\n");
 dyStringPrintf(dy, "patDb varchar(255),\n");
+dyStringPrintf(dy, "microscope varchar(255),\n");
 dyStringPrintf(dy, "sampleField varchar(255),\n");
 dyStringPrintf(dy, "patTable varchar(255),\n");
 dyStringPrintf(dy, "patField varchar(255),\n");
 dyStringPrintf(dy, "aliasTable varchar(255),\n");
@@ -77,9 +78,8 @@
 dyStringPrintf(dy, "visibility varchar(255),\n");
 dyStringPrintf(dy, "priority float,\n");
 dyStringPrintf(dy, "url varchar(255),\n");
 dyStringPrintf(dy, "security varchar(255),\n");
-dyStringPrintf(dy, "local_url varchar(255),\n");
 dyStringPrintf(dy, "profile varchar(255),\n");
 dyStringPrintf(dy, "wrangler varchar(255),\n");
 dyStringPrintf(dy, "citation varchar(255),\n");
 dyStringPrintf(dy, "article_title longblob,\n");
@@ -119,8 +119,9 @@
 dyStringPrintf(update, "%u,", *(el->height));
 dyAddStringNULL(update, el->groupName, TRUE);
 dyAddStringNULL(update, el->raFile, TRUE);
 dyAddStringNULL(update, el->patDb, TRUE);
+dyAddStringNULL(update, el->microscope, TRUE);
 dyAddStringNULL(update, el->sampleField, TRUE);
 dyAddStringNULL(update, el->patTable, TRUE);
 dyAddStringNULL(update, el->patField, TRUE);
 dyAddStringNULL(update, el->aliasTable, TRUE);
@@ -134,9 +135,8 @@
 dyAddStringNULL(update, el->visibility, TRUE);
 dyStringPrintf(update, "%g,", *(el->priority));
 dyAddStringNULL(update, el->url, TRUE);
 dyAddStringNULL(update, el->security, TRUE);
-dyAddStringNULL(update, el->local_url, TRUE);
 dyAddStringNULL(update, el->profile, TRUE);
 dyAddStringNULL(update, el->wrangler, TRUE);
 dyAddStringNULL(update, el->citation, TRUE);
 dyAddStringNULL(update, el->article_title, TRUE);
@@ -326,12 +326,12 @@
 ra->aliasTable  = NULL;
 ra->displayNameTable = NULL;
 ra->shortLabel  = NULL;
 ra->longLabel   = NULL;
-ra->local_url   = NULL;
 ra->groupName   = NULL;
 ra->raFile      = NULL;
 ra->patDb       = NULL;
+ra->microscope  = NULL;
 ra->patTable    = NULL;
 ra->patField    = NULL;
 ra->sampleField = NULL;
 ra->platform    = NULL;
@@ -537,9 +537,8 @@
 hFreeConn(&conn);  // No longer need connection
 
 ra->shortLabel  = mustGetString(raHash, "shortLabel");
 ra->longLabel   = mustGetString(raHash, "longLabel");
-ra->local_url   = getOptionalString(raHash, "local_url", NULL);
 ra->groupName   = getOptionalString(raHash, "group", NULL);
 
 
 /* Settings on patient information from datasets.ra file */
@@ -554,8 +553,9 @@
     
 /* Platform setting, currently defaults to expression */
 ra->platform   = getOptionalString(raHash, "platform", "expression");
 
+ra->microscope = getOptionalString(raHash, "microscope", NULL);
 ra->type       = getOptionalString(raHash, "type", NULL);
 ra->url        = getOptionalString(raHash, "url", NULL);
 ra->visibility = getOptionalString(raHash, "visibility", "off");
 ra->security   = getOptionalString(raHash, "security", "private");