Changeset 4626

Timestamp:

Nov 5, 2008, 10:56:12 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1164: Reporter importer plug-in displays 'Reporter ID' when setting column mappings... should be 'External ID'

Decided to keep 'Reporter ID' on other plug-ins and only calrify the description since if using 'External ID' it is not clear what this references (eg. spot external id, feature external id...)

Location:

trunk

Files:

• doc/test/roles/index.html (modified) (3 diffs)
• src/plugins/core/net/sf/basedb/plugins/PlateFlatFileImporter.java (modified) (2 diffs)
• src/plugins/core/net/sf/basedb/plugins/RawDataFlatFileImporter.java (modified) (1 diff)
• src/plugins/core/net/sf/basedb/plugins/ReporterFlatFileImporter.java (modified) (1 diff)
• src/plugins/core/net/sf/basedb/plugins/ReporterMapFlatFileImporter.java (modified) (1 diff)
• www/lims/plates/wells/edit_well.jsp (modified) (1 diff)

trunk/doc/test/roles/index.html

@@ -325 +325 @@
       </tr>
       <tr>
-        <td><i>Reporter ID</i></td>
+        <td><i>External ID</i></td>
         <td>\oligo_id\</td>
       </tr>
@@ -373 +373 @@
       </tr>
       <tr>
-        <td><i>Reporter ID</i></td>
+        <td><i>External ID</i></td>
         <td>\ID\</td>
       </tr>
@@ -399 +399 @@
       </tr>
       <tr>
-        <td><i>Reporter ID</i></td>
+        <td><i>External ID</i></td>
         <td>\Probe Set ID\</td>
       </tr>

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

@@ -126 +126 @@
     "reporterColumnMapping",
     "Reporter ID",
-    "Mapping that picks the well's reporter id from the data columns. " +
+    "Mapping that picks the 'External ID' of the well's reporter from the data columns. " +
     "For example: \\ID\\",
     new StringParameterType(255, null, true)
@@ -161 +161 @@
     "reporterPrefix",
     "Reporter ID prefix",
-    "This prefix is prepended to the reporter IDs in the input file.",
+    "This prefix is prepended to the external reporter IDs in the input file before " +
+    "a reporter lookup is performed.",
     new StringParameterType(255, null, false)
   );

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

@@ -218 +218 @@
     "reporterIdColumnMapping",
     "Reporter ID",
-    "Mapping that picks the spot's reporter from the data columns. " +
+    "Mapping that picks the 'External ID' of the spot's reporter from the data columns. " +
     "For example: \\ID\\",
     requiredColumnMapping

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

@@ -129 +129 @@
   private static final PluginParameter<String> reporterIdColumnMapping = new PluginParameter<String>(
     "reporterIdColumnMapping",
-    "Reporter ID",
-    "Mapping that picks the reporter's ID from the data columns. " +
+    "External ID",
+    "Mapping that picks the reporter's external ID from the data columns. " +
     "For example: \\ID\\",
     requiredColumnMapping

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

@@ -128 +128 @@
     "reporterIdColumnMapping",
     "Reporter ID",
-    "Mapping that picks the reporter's ID from the data columns. " +
+    "Mapping that picks the reporter's external ID from the data columns. " +
     "For example: \\ID\\",
     requiredColumnMapping

trunk/www/lims/plates/wells/edit_well.jsp

@@ -147 +147 @@
       </tr>
       <tr>
-        <td class="prompt">Reporter ID</td>
+        <td class="prompt">Reporter External ID</td>
         <td><%=reporter == null ? "<i>- none -</i>" : HTML.encodeTags(reporter.getExternalId())%></td>
       </tr>