src/hg/lib/tRNAs.c 1.2

Index: src/hg/lib/tRNAs.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/tRNAs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -B -U 4 -r1.1 -r1.2
--- src/hg/lib/tRNAs.c	1 Dec 2005 01:32:38 -0000	1.1
+++ src/hg/lib/tRNAs.c	7 Jan 2010 02:54:53 -0000	1.2
@@ -19,13 +19,15 @@
 ret->chromStart = sqlUnsigned(row[1]);
 ret->chromEnd = sqlUnsigned(row[2]);
 ret->name = row[3];
 ret->score = sqlUnsigned(row[4]);
-strcpy(ret->strand, row[5]);
+safecpy(ret->strand, sizeof(ret->strand), row[5]);
 ret->aa = row[6];
 ret->ac = row[7];
 ret->intron = row[8];
-ret->trnaScore = atof(row[9]);
+ret->trnaScore = sqlFloat(row[9]);
+ret->genomeUrl = row[10];
+ret->trnaUrl = row[11];
 }
 
 struct tRNAs *tRNAsLoad(char **row)
 /* Load a tRNAs from row fetched with select * from tRNAs
@@ -38,13 +40,15 @@
 ret->chromStart = sqlUnsigned(row[1]);
 ret->chromEnd = sqlUnsigned(row[2]);
 ret->name = cloneString(row[3]);
 ret->score = sqlUnsigned(row[4]);
-strcpy(ret->strand, row[5]);
+safecpy(ret->strand, sizeof(ret->strand), row[5]);
 ret->aa = cloneString(row[6]);
 ret->ac = cloneString(row[7]);
 ret->intron = cloneString(row[8]);
-ret->trnaScore = atof(row[9]);
+ret->trnaScore = sqlFloat(row[9]);
+ret->genomeUrl = cloneString(row[10]);
+ret->trnaUrl = cloneString(row[11]);
 return ret;
 }
 
 struct tRNAs *tRNAsLoadAll(char *fileName) 
@@ -52,9 +56,9 @@
  * Dispose of this with tRNAsFreeList(). */
 {
 struct tRNAs *list = NULL, *el;
 struct lineFile *lf = lineFileOpen(fileName, TRUE);
-char *row[10];
+char *row[12];
 
 while (lineFileRow(lf, row))
     {
     el = tRNAsLoad(row);
@@ -70,9 +74,9 @@
  * Dispose of this with tRNAsFreeList(). */
 {
 struct tRNAs *list = NULL, *el;
 struct lineFile *lf = lineFileOpen(fileName, TRUE);
-char *row[10];
+char *row[12];
 
 while (lineFileNextCharRow(lf, chopper, row, ArraySize(row)))
     {
     el = tRNAsLoad(row);
@@ -101,8 +105,10 @@
 ret->aa = sqlStringComma(&s);
 ret->ac = sqlStringComma(&s);
 ret->intron = sqlStringComma(&s);
 ret->trnaScore = sqlFloatComma(&s);
+ret->genomeUrl = sqlStringComma(&s);
+ret->trnaUrl = sqlStringComma(&s);
 *pS = s;
 return ret;
 }
 
@@ -117,8 +123,10 @@
 freeMem(el->name);
 freeMem(el->aa);
 freeMem(el->ac);
 freeMem(el->intron);
+freeMem(el->genomeUrl);
+freeMem(el->trnaUrl);
 freez(pEl);
 }
 
 void tRNAsFreeList(struct tRNAs **pList)
@@ -167,8 +175,16 @@
 fprintf(f, "%s", el->intron);
 if (sep == ',') fputc('"',f);
 fputc(sep,f);
 fprintf(f, "%g", el->trnaScore);
+fputc(sep,f);
+if (sep == ',') fputc('"',f);
+fprintf(f, "%s", el->genomeUrl);
+if (sep == ',') fputc('"',f);
+fputc(sep,f);
+if (sep == ',') fputc('"',f);
+fprintf(f, "%s", el->trnaUrl);
+if (sep == ',') fputc('"',f);
 fputc(lastSep,f);
 }
 
 /* -------------------------------- End autoSql Generated Code -------------------------------- */