Changeset 3112

Timestamp:

Feb 7, 2007, 2:13:05 AM (16 years ago)

Author:

Jari Häkkinen

Message:

Removed MeV export of an unneeded reporter column.

Location:

trunk

Files:

• src/plugins/core/net/sf/basedb/plugins/BioAssaySetExporter.java (modified) (3 diffs)
• www/plugins/org/tigr/microarray/mev/launch_mev.jsp (modified) (1 diff)

trunk/src/plugins/core/net/sf/basedb/plugins/BioAssaySetExporter.java

@@ -449 +449 @@
     // Data header
     // Reporter headers
-    out.write("reporterInternalId\treporterID\tlastUpdate\tgeneSymbol");
+    out.write("reporterInternalId\treporterID\tgeneSymbol");
     for (ExtendedProperty ep : reporterProperties)
       out.write("\t"+ep.getName());
-    // Number 3 in below statement comes from using three reporter
+    // Number 2 in below statement comes from using two reporter
     // entries from ReporterData. Below there is dependencies on this
-    // '3' such as the selectReporter("") in below query.select()
+    // '2' such as the selectReporter("") in below query.select()
     // statements (and more).
-    int nof_reporter_columns=3+reporterProperties.size();
+    int nof_reporter_columns=2+reporterProperties.size();
     // Bioassay headers
     out.write("\texperimentalFactor");
@@ -488 +488 @@
     query.select(Dynamic.select(VirtualColumn.COLUMN));
     query.select(Dynamic.selectReporter("externalId"));
-    query.select(Dynamic.selectReporter("lastUpdate"));
     query.select(Dynamic.selectReporter("symbol"));
     for (ExtendedProperty ep : reporterProperties)
@@ -505 +504 @@
     int[] column_reporter= new int[nof_reporter_columns];
     column_reporter[0]=spotData.getIndex("externalId");
-    column_reporter[1]=spotData.getIndex("lastUpdate");
-    column_reporter[2]=spotData.getIndex("symbol");
-    int idx=3;
+    column_reporter[1]=spotData.getIndex("symbol");
+    int idx=2;
     for (ExtendedProperty ep : reporterProperties)
     {

trunk/www/plugins/org/tigr/microarray/mev/launch_mev.jsp

@@ -44 +44 @@
 // file. Columns and row index in MeV starts at 0. Starting column is
 // the sum of: number of extended reporter data (server specific
-// number) + number of non extended reporter data (currently 4 is used
+// number) + number of non extended reporter data (currently 3 is used
 // in mevExport in bioassayset exporter) + the experimental factor
 // column (that is 1).
-final int column_idx=ExtendedProperties.getProperties("ReporterData").size()+5;
+final int column_idx=ExtendedProperties.getProperties("ReporterData").size()+4;
 // The starting row is the sum of: The header line (1) + the number of
 // experimental factor annotations for an experiemnt.