src/hg/makeDb/schema/all.joiner 1.696

Index: src/hg/makeDb/schema/all.joiner
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/makeDb/schema/all.joiner,v
retrieving revision 1.695
retrieving revision 1.696
diff -b -B -U 4 -r1.695 -r1.696
--- src/hg/makeDb/schema/all.joiner	23 Feb 2009 18:07:20 -0000	1.695
+++ src/hg/makeDb/schema/all.joiner	24 Feb 2009 22:20:18 -0000	1.696
@@ -1122,10 +1122,12 @@
 
 identifier nativeEstAccession typeOf=estAccession
 "Genbank Native (same organism as database) EST accession"
     $gbd.all_est.qName dupeOk
-    $gbd.est.qName $split full 
-    $gbd,!caeJap1.intronEst.qName $split
+    $gbd,!sacCer2.est.qName $split full 
+    $gbd,!sacCer2,!caeJap1.intronEst.qName $split
+    sacCer2.est.qName splitPrefix=%\_ full 
+    sacCer2.intronEst.qName splitPrefix=%\_
     caeJap1.intronEst.qName 
     $gbd.estOrientInfo.name full 
 
 identifier xenoEstAccession typeOf=estAccession
@@ -1266,10 +1268,8 @@
     $kgDb.kgXref.kgID full
     $kgDb.kgTxInfo.name full
     $kgDb.knownBlastTab.query
     $kgDb.knownBlastTab.target
-    $sacCer.knownBlastTab.query
-    $sacCer.knownBlastTab.target
     $kgDb.knownCanonical.transcript 
     $kgDb.knownGeneMrna.name full
     $kgDb,!hg18,!mm9.knownGeneLink.name
     $kgDb.knownIsoforms.transcript full
@@ -1624,9 +1624,9 @@
     $dm.fbTranscript.geneId minCheck=0.95
     dm1.flyBaseSwissProt.flyBaseId minCheck=0.95
     $dm,!dm1.flyBase2004Xref.fbgn minCheck=0.90
     $dm,!dm1.pscreen.geneIds comma minCheck=0.95
-    $gbd,!hg17,!hg18,!danRer3,!mm7,!mm8,!mm9,!rn3,!rn4,!ce2,!ce6,!sacCer2.dmBlastTab.target,!sacCer1.dmBlastTab.target minCheck=0.90
+    $gbd,!hg17,!hg18,!danRer3,!mm7,!mm8,!mm9,!rn3,!rn4,!ce2,!ce6,!sacCer1,!sacCer2.dmBlastTab.target minCheck=0.90
 
 identifier bdgpIsoformCluster
 "Overlapping (after splicing) BDGP Drosophila transcripts"
     dm1.bdgpCanonical.clusterId
@@ -1693,9 +1693,9 @@
     $dm,!dm1.flyBaseToCG.name
     $dm,!dm1.flyBaseToDescription.name
     $dm,!dm1.flyP2P.query minCheck=0.98
     $dm,!dm1.flyP2P.target minCheck=0.98
-    hg17,hg18,danRer3,mm7,mm8,mm9,rn3,rn4,ce2,sacCer1.dmBlastTab.target,sacCer2.dmBlastTab.target minCheck=0.90
+    hg17,hg18,danRer3,mm7,mm8,mm9,rn3,rn4,ce2,sacCer1,sacCer2.dmBlastTab.target minCheck=0.90
 
 identifier flyBase2004IdDp external=FlyBase
 "FlyBase Xref as of 2004 for dp3"
     dp3.flyBase2004Xref.name
@@ -1720,8 +1720,9 @@
     $sacCer,!sacCer1.drBlastTab.query
     $sacCer.hgBlastTab.query minCheck=0.999
     $sacCer.mmBlastTab.query
     $sacCer.rnBlastTab.query
+    sacCer2.knownBlastTab.query
     $sacCer.choExpDistance.target minCheck=0.60
     $sacCer.choExpDistance.query minCheck=0.60
     $sacCer.sgdCanonical.transcript
     $sacCer.sgdDescription.name
@@ -1738,9 +1739,9 @@
     $sacCer.esRegUpstreamRegion.name minCheck=0.96
 
 identifier sgdNoncodingId typeOf=sgdId
 "Sacchromyces Genome Database Noncoding/Dubious feature ID"
-    $sacCer.sgdOther.name
+    $sacCer.sgdOther.name dupeOk
     $sacCer.sgdOtherDescription.name
 
 # RGD Family Identifiers
 
@@ -2778,9 +2779,10 @@
     $gbd.scBlastTab
     $gbd.knownBlastTab
     $ce.sangerBlastTab
     dm1.bdgpBlastTab
-    $sacCer.sgdBlastTab
+    sacCer1.sgdBlastTab
+    sacCer2.knownBlastTab
 
 type knownCanonical
     $gbd.knownCanonical
     $ce.sangerCanonical