got basic mapping to work

wanghp18 · Mar 6, 2015 · 008aeec · 008aeec
1 parent b5f66a6
commit 008aeec
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/seed/common/mapper.py b/seed/common/mapper.py
@@ -23,19 +23,22 @@ def get_pm_mapping(version, columns, include_none=False):
     Args:
       version (str): Version in format 'x.y[.z]'
       columns (list): A list of [column_name, field, {metadata}]
-      include_none (bool): If True, add [column_name, None, None] for
-                           columns that had no match.
+      include_none (bool): If True, add {column:None} for unmatched columns.
+    Return:
+       map of {column:MapItem}
     """
     conf = MappingConfiguration()
     version_parts = version.split('.')
     mp = conf.pm(version_parts)
-    result = []
+    result = {}
     for col in columns:
         mapped = mp.get(col, None)
         if mapped:
-            result.append([col] + mp[col].as_json())
+            result[col] = mapped
         elif include_none:
-            result.append([col, None, None])
+            result[col] = None
+        else:
+            pass # nothing added to result
     _log.debug("get_pm_mapping: result={}".format(result))
     return result
 

diff --git a/seed/views/main.py b/seed/views/main.py
@@ -191,10 +191,11 @@ def create_pm_mapping(request):
         return vutil.api_error(invalid)
 
     try:
-        result = simple_mapper.get_pm_mapping((1, 0), body['columns'])
+        result = simple_mapper.get_pm_mapping('1.0', body['columns'])
     except ValueError as err:
         return vutil.api_error(str(err))
-    return vutil.api_success(mapping=result)
+    json_result = [[c] + v.as_json() for c, v in result.items()]
+    return vutil.api_success(mapping=json_result)
 
 @api_endpoint
 @ajax_request
@@ -1185,14 +1186,13 @@ def get_column_mapping_suggestions(request):
         _log.info("map Portfolio Manager input file")
         suggested_mappings = {}
         ver = import_file.source_program_version
-        for item in simple_mapper.get_pm_mapping(
+        for col, item in simple_mapper.get_pm_mapping(
                 ver, import_file.first_row_columns,
-                include_none=True):
-            col, fld, meta = item
-            if fld is None:
+                include_none=True).items():
+            if item is None:
                 suggested_mappings[col] = (col, 0)
             else:
-                suggested_mappings[col] = (fld, 1)
+                suggested_mappings[col] = (item.field, 100)
     else:
         # All other input types
         suggested_mappings = mapper.build_column_mapping(