Index: feedapi_mapper.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/feedapi_mapper.module,v
retrieving revision 1.1.2.7.2.11
diff -u -p -r1.1.2.7.2.11 feedapi_mapper.module
--- feedapi_mapper.module	15 Dec 2008 22:43:31 -0000	1.1.2.7.2.11
+++ feedapi_mapper.module	29 Dec 2008 14:09:59 -0000
@@ -609,13 +609,26 @@ function _feedapi_mapper_get_field_names
     $node['taxonomy'] = array();
     $fields = array_merge($form, $node);
 
-    foreach ($fields as $k => $v ) {
-      if (strpos($k, '#') === FALSE) {
-        $field_names[$node_type][] = $k;
-      }
-    }
+    $field_names[$node_type] = _feedapi_mapper_extract_names($fields);
     sort($field_names[$node_type]);
   }
   return $field_names[$node_type];
 }
 
+/**
+ * Recursively get the possible field names from the form structure
+ */
+function _feedapi_mapper_extract_names($fields) {
+  $names = array();
+  foreach ($fields as $k => $v ) {
+    if (strpos($k, '#') === FALSE) {
+      if ($v['#type'] == 'fieldset') {
+        $names = array_merge($names, _feedapi_mapper_extract_names($v));
+      }
+      else {
+        $names[] = $k;
+      }
+    }
+  }
+  return $names;
+}