Changeset 16030

Timestamp:

02/07/08 15:37:46 (5 months ago)

Author:

kmr

Message:

Don't create DataSource? with no title when loading fasta.
Refs #1761.

Files:

• trunk/bio/sources/fasta/main/src/org/intermine/bio/dataconversion/FastaLoaderTask.java (modified) (1 diff)
• trunk/flymine/project.xml (modified) (14 diffs)

trunk/bio/sources/fasta/main/src/org/intermine/bio/dataconversion/FastaLoaderTask.java

@@ -326 +326 @@
-            dataSet.setTitle(dataSetTitle);
-            getDirectDataLoader().store(dataSet);
-            if (getDataSource() != null) {
-                dataSet.setDataSource(getDataSource());
-            }
-            dataSets.put(dataSetTitle, dataSet);
-            return dataSet;

trunk/flymine/project.xml

@@ -250 +250 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dmel-all-CDS-*.fasta"/>
-Drosophila melanogaster data set
+data set for Drosophila melanogaster
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -260 +260 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dpse-all-CDS-*.fasta"/>
-Drosophila pseudoobscura pseudoobscura data set
+data set for Drosophila pseudoobscura pseudoobscura
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -270 +270 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dana-all-CDS-*.fasta"/>
-Drosophila ananassae data set
+data set for Drosophila ananassae
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -280 +280 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dere-all-CDS-*.fasta"/>
-Drosophila erecta data set
+data set for Drosophila erecta
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -290 +290 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dgri-all-CDS-*.fasta"/>
-Drosophila grimshawi data set
+data set for Drosophila grimshawi
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -300 +300 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dmoj-all-CDS-*.fasta"/>
-Drosophila mojavensis data set
+data set for Drosophila mojavensis
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -310 +310 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dper-all-CDS-*.fasta"/>
-Drosophila persimilis data set
+data set for Drosophila persimilis
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -320 +320 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dsec-all-CDS-*.fasta"/>
-Drosophila sechellia data set
+data set for Drosophila sechellia
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -330 +330 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dsim-all-CDS-*.fasta"/>
-Drosophila simulans data set
+data set for Drosophila simulans
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -340 +340 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dvir-all-CDS-*.fasta"/>
-Drosophila virilis data set
+data set for Drosophila virilis
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -350 +350 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dwil-all-CDS-*.fasta"/>
-Drosophila willistoni data set
+data set for Drosophila willistoni
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -360 +360 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dyak-all-CDS-*.fasta"/>
-Drosophila yakuba data set
+data set for Drosophila yakuba
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>
@@ -369 +369 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dmel-all-five_prime_UTR-*.fasta"/>
-Drosophila melanogaster data set
-
-
-            
+data set for Drosophila melanogaster
+
+
+
-      <property name="fasta.loaderClassName" value="org.intermine.bio.dataconversion.FlyBaseUTRFastaLoaderTask"/>
-      <property name="fasta.taxonId" value="7227"/>
@@ -378 +378 @@
-      <property name="fasta.classAttribute" value="primaryIdentifier"/>
-      <property name="fasta.includes" value="dmel-all-three_prime_UTR-*.fasta"/>
-Drosophila melanogaster data set
+data set for Drosophila melanogaster
-      <property name="src.data.dir" location="/shared/data/flybase/FB2008_05/fasta"/>
-    </source>