Changeset 3598

Timestamp:

Jul 25, 2007, 8:19:55 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #566: Plugins using the flat file parser should warn about complex column mappings

Location:

trunk/src/plugins/core/net/sf/basedb/plugins

Files:

• AbstractFlatFileImporter.java (modified) (1 diff)
• AnnotationFlatFileImporter.java (modified) (4 diffs)

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

@@ -326 +326 @@
   */
   protected static final PluginParameter<String> complexMappings = new PluginParameter<String>(
-    "complexMappings",
+    "complexExpressions",
     "Complex column mappings",
     "disallow = Only allow simple mappings that are constant value or pick the value " +

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

@@ -443 +443 @@
         // Check that a mapping for name OR external ID is given
         boolean hasExternalId = context == null || hasExternalId(context.getItem());
+        String nameMapping = (String)request.getParameterValue("nameColumnMapping");
+        String externalIdMapping = (String)request.getParameterValue("externalIdColumnMapping");
         if (hasExternalId)
         {
-          if (request.getParameterValue("nameColumnMapping") == null && 
-            request.getParameterValue("externalIdColumnMapping") == null)
+          if (nameMapping == null && externalIdMapping == null)
           {
             response.setError("A mapping for either 'Name' or 'External Id' must be given.", null);
             return;
           }
-          if (request.getParameterValue("nameColumnMapping") != null &&
-            request.getParameterValue("externalIdColumnMapping") != null)
+          if (nameMapping != null && externalIdMapping != null)
           {
             response.setError("It is not possible to use a mapping for both 'Name' and 'External Id'.", null);
@@ -458 +458 @@
           }
         }
-      
+        // Check the mapping expressions
+        boolean allowComplex = "allow".equals(request.getParameterValue(complexMappings.getName()));
+        checkColumnMapping(nameMapping, allowComplex, requiredNameColumnMapping.getLabel());
+        checkColumnMapping(externalIdMapping, allowComplex, externalIdColumnMapping.getLabel());
+
         // Everything is ok, save values
         if (forJob) storeValue(wrapper, request, fileParameter);
@@ -470 +474 @@
         storeValue(wrapper, request, ri.getParameter(CHARSET));
         storeValue(wrapper, request, ri.getParameter(DECIMAL_SEPARATOR));
+        
+        // Column mappings
+        storeValue(wrapper, request, complexMappings);
         if (hasExternalId)
         {
@@ -879 +886 @@
       // Mappings for Name and External ID
       parameters.add(mappingSection);
+      parameters.add(complexMappings);
       if (context == null || hasExternalId(context.getItem()))
       {