Index: feeds.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/feeds.module,v
retrieving revision 1.47
diff -u -r1.47 feeds.module
--- feeds.module	19 Jun 2010 20:34:31 -0000	1.47
+++ feeds.module	6 Jul 2010 09:33:11 -0000
@@ -125,7 +125,25 @@
         'type' => MENU_LOCAL_TASK,
         'weight' => 11,
       );
+      $items['node/%node/mapping'] = array(
+        'title' => $importer->config['name'],
+        'page callback' => 'drupal_get_form',
+        'page arguments' => array('feeds_import_mapping_form', $importer->id, 1),
+        'access callback' => 'feeds_access',
+        'access arguments' => array('import', 1),
+        'file' => 'feeds.pages.inc',
+      );
     }
+
+    $items['import/'. $importer->id . '/mapping'] = array (
+      'title' => $importer->config['name'],
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('feeds_import_mapping_form', 1),
+      'access callback' => 'feeds_access',
+      'access arguments' => array('import', $importer->id),
+      'file' => 'feeds.pages.inc',
+    );
+
     $items += $importer->fetcher->menuItem();
   }
   if (count($items)) {
@@ -154,6 +172,9 @@
     'feeds_info' => array(
       'file' => 'feeds.pages.inc',
     ),
+    'feeds_mapping_form' => array(
+      'file' => 'feeds.pages.inc'
+    ),
   );
 }
 
@@ -301,17 +322,22 @@
         $source->addConfig($node_feeds);
         $source->save();
 
-        // Refresh feed if import on create is selected and suppress_import is
-        // not set.
-        if ($op == 'insert' && feeds_importer($importer_id)->config['import_on_create'] && !isset($node_feeds['suppress_import'])) {
-          feeds_batch_set(t('Importing'), 'import', $importer_id, $node->nid);
+        if ($source->importer->processor->config['mapping_on_import']) {
+          $_REQUEST['destination'] = 'import/' . $importer_id . '/mapping/' . $node->nid;
+        }
+        else {
+          // Refresh feed if import on create is selected and suppress_import is
+          // not set.
+          if ($op == 'insert' && feeds_importer($importer_id)->config['import_on_create'] && !isset($node_feeds['suppress_import'])) {
+            feeds_batch_set(t('Importing'), 'import', $importer_id, $node->nid);
+          }
+          // Add import to scheduler.
+          feeds_scheduler()->add($importer_id, 'import', $node->nid);
+          // Add expiry to schedule, in case this is the first feed of this
+          // configuration.
+          feeds_scheduler()->add($importer_id, 'expire');
+          $node_feeds = NULL;
         }
-        // Add import to scheduler.
-        feeds_scheduler()->add($importer_id, 'import', $node->nid);
-        // Add expiry to schedule, in case this is the first feed of this
-        // configuration.
-        feeds_scheduler()->add($importer_id, 'expire');
-        $node_feeds = NULL;
         break;
       case 'delete':
         // Remove feed from scheduler and delete source.
Index: feeds.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/feeds.pages.inc,v
retrieving revision 1.18
diff -u -r1.18 feeds.pages.inc
--- feeds.pages.inc	4 May 2010 21:24:58 -0000	1.18
+++ feeds.pages.inc	6 Jul 2010 09:33:20 -0000
@@ -59,6 +59,12 @@
     '#type' => 'submit',
     '#value' => t('Import'),
   );
+
+  // If mapping on import is selected, redirect to feeds_import_mapping_form
+  if ($source->importer->processor->config['mapping_on_import']) {
+    $form['#redirect'] = '/import/' . $importer_id . '/mapping';
+  }
+
   return $form;
 }
 
@@ -74,20 +80,25 @@
  * Submit handler for feeds_import_form().
  */
 function feeds_import_form_submit($form, &$form_state) {
-
   // Save source and import.
   $source = feeds_source($form['#importer_id']);
   $source->addConfig($form_state['values']['feeds']);
   $source->save();
 
-  // Refresh feed if import on create is selected.
-  if ($source->importer->config['import_on_create']) {
-    feeds_batch_set(t('Importing'), 'import', $form['#importer_id']);
+  if ($source->importer->processor->config['mapping_on_import']) {
+    // Handle the redirection to mapping form
+    $form_state['redirect'] = $form['#redirect'];
+  }
+  else {
+    // Refresh feed if import on create is selected.
+    if ($source->importer->config['import_on_create']) {
+      feeds_batch_set(t('Importing'), 'import', $form['#importer_id']);
+    }
+
+    // Add importer to schedule.
+    feeds_scheduler()->add($form['#importer_id'], 'import');
+    feeds_scheduler()->add($form['#importer_id'], 'expire');
   }
-
-  // Add importer to schedule.
-  feeds_scheduler()->add($form['#importer_id'], 'import');
-  feeds_scheduler()->add($form['#importer_id'], 'expire');
 }
 
 /**
@@ -152,3 +163,136 @@
   }
   drupal_access_denied();
 }
+
+/**
+ * Declare Feeds mapping on import form
+ */
+function feeds_import_mapping_form(&$form_state, $importer_id, $feed_nid = 0) {
+  $source = feeds_source($importer_id, $feed_nid);
+
+  // Fetch and parse the source to enable batch to provide mapping sources
+  $batch = $source->importer->fetcher->fetch($source);
+  $source->importer->parser->parse($batch, $source);
+
+  $form = $source->importer->processor->mappingForm($form, 'mapping', $batch);
+  $form['#configurable'] = $source->importer->processor;
+  $form['#importer_id'] = $importer_id;
+  $form['#feed_nid'] = $feed_nid;
+  //$form['#attributes']['enctype'] = 'multipart/form-data';
+
+  $form['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Import'),
+    '#submit' => array('feeds_import_mapping_form_import_submit'),
+  );
+  return $form;
+}
+
+/**
+ * Default submit handler for mapping on import form
+ */
+function feeds_import_mapping_form_submit($form, &$form_state) {
+  $form['#configurable']->addConfig($form_state['values']);
+  $form['#configurable']->save();
+  drupal_set_message(t('Your changes have been saved.'));
+  feeds_cache_clear(FALSE);
+}
+
+/**
+ * Import submit handler for mapping on import form
+ */
+function feeds_import_mapping_form_import_submit($form, &$form_state) {
+  // Handle the redirections
+  if (!$form['#feed_nid']) {
+    $form_state['redirect'] = 'import/' . $form['#importer_id'];
+  }
+  else {
+    $form_state['redirect'] = 'node/' . $form['#feed_nid'];
+  }
+
+  $source = feeds_source($form['#importer_id'], $form['#feed_nid']);
+
+  // Refresh feed if import on create is selected.
+  if ($source->importer->config['import_on_create']) {
+    feeds_batch_set(t('Importing'), 'import', $form['#importer_id'], $form['#feed_nid']);
+  }
+
+  // Add importer to schedule.
+  feeds_scheduler()->add($form['#importer_id'], 'import', $form['#feed_nid']);
+  feeds_scheduler()->add($form['#importer_id'], 'expire', $form['#feed_nid']);
+}
+
+/**
+ * Theme function for feeds_mapping_form().
+ */
+function theme_feeds_mapping_form($form) {
+  // Build the actual mapping table.
+  $header = array(
+    t('Source'),
+    t('Target'),
+    t('Unique target'),
+    ' ',
+  );
+  $rows = array();
+  if (is_array($form['#mappings'])) {
+    foreach ($form['#mappings'] as $i => $mapping) {
+      $rows[] = array(
+        $mapping['source'],
+        $mapping['target'],
+        drupal_render($form['unique_flags'][$i]),
+        drupal_render($form['remove_flags'][$i]),
+      );
+    }
+  }
+  if (!count($rows)) {
+    $rows[] = array(
+      array(
+        'colspan' => 4,
+        'data' => t('No mappings defined.'),
+      ),
+    );
+  }
+  $rows[] = array(
+    drupal_render($form['source']),
+    drupal_render($form['target']),
+    '',
+    drupal_render($form['add']),
+  );
+  $output = '<div class="help feeds-admin-ui""'. drupal_render($form['help']) .'</div>';
+  $output .= theme('table', $header, $rows);
+
+  // Build the help table that explains available sources.
+  $legend = '';
+  $rows = array();
+  foreach (element_children($form['legendset']['legend']['sources']) as $k) {
+    $rows[] = array(
+      drupal_render($form['legendset']['legend']['sources'][$k]['name']),
+      drupal_render($form['legendset']['legend']['sources'][$k]['description']),
+    );
+  }
+  if (count($rows)) {
+    $legend .= '<h4>'. t('Sources') .'</h4>';
+    $legend .= theme('table', array(t('Name'), t('Description')), $rows);
+  }
+
+  // Build the help table that explains available targets.
+  $rows = array();
+  foreach (element_children($form['legendset']['legend']['targets']) as $k) {
+    $rows[] = array(
+      drupal_render($form['legendset']['legend']['targets'][$k]['name']),
+      drupal_render($form['legendset']['legend']['targets'][$k]['description']),
+    );
+  }
+  $legend .= '<h4>'. t('Targets') .'</h4>';
+  $legend .= theme('table', array(t('Name'), t('Description')), $rows);
+
+  // Stick tables into collapsible fieldset.
+  $form['legendset']['legend'] = array(
+    '#value' => '<div>'. $legend .'</div>',
+  );
+
+  $output .= drupal_render($form['legendset']);
+
+  $output .= drupal_render($form);
+  return $output;
+}
Index: feeds_ui/feeds_ui.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/feeds_ui/feeds_ui.admin.inc,v
retrieving revision 1.30
diff -u -r1.30 feeds_ui.admin.inc
--- feeds_ui/feeds_ui.admin.inc	5 May 2010 23:52:48 -0000	1.30
+++ feeds_ui/feeds_ui.admin.inc	6 Jul 2010 05:37:04 -0000
@@ -36,17 +36,6 @@
 }
 
 /**
- * Help text for mapping.
- */
-function feeds_ui_mapping_help() {
-  return t('
-  <p>
-  Define which elements of a single item of a feed (= <em>Sources</em>) map to which content pieces in Drupal (= <em>Targets</em>). Make sure that at least one definition has a <em>Unique target</em>. A unique target means that a value for a target can only occur once. E. g. only one item with the URL <em>http://example.com/story/1</em> can exist.
-  </p>
-  ');
-}
-
-/**
  * Build overview of available configurations.
  */
 function feeds_ui_overview_form(&$form_status) {
@@ -309,9 +298,11 @@
         $active_container['body'] = feeds_get_config_form($plugin);
       }
       break;
-    case 'mapping':
-      $active_container['title'] = t('Mapping for !processor', array('!processor' => $plugins[$config['processor']['plugin_key']]['name']));
-      $active_container['body'] = drupal_get_form('feeds_ui_mapping_form', $importer);
+    case 'mapping':      
+      if (in_array($plugin_key, array_keys($plugins)) && $plugin = feeds_plugin_instance($plugin_key, $importer->id)) {
+        $active_container['title'] = t('Mapping for !processor', array('!processor' => $plugins[$config['processor']['plugin_key']]['name']));
+        $active_container['body'] = feeds_get_config_form($plugin, 'mappingForm');
+      }
       break;
   }
 
@@ -382,8 +373,8 @@
   $actions = array();
   if (feeds_get_config_form($importer->processor)) {
     $actions[] = l(t('Settings'), $path .'/settings/'. $config['processor']['plugin_key']);
-  }
-  $actions[] = l(t('Mapping'), $path .'/mapping');
+    $actions[] = l(t('Mapping'), $path .'/mapping/'. $config['processor']['plugin_key']);
+  }  
   $info['title'] = t('Processor');
   $info['body'] = array(
     array(
@@ -473,174 +464,6 @@
 }
 
 /**
- * Edit mapping.
- *
- * @todo Completely merge this into config form handling. This is just a
- *   shared form of configuration, most of the common functionality can live in
- *   FeedsProcessor, a flag can tell whether mapping is supported or not.
- */
-function feeds_ui_mapping_form(&$form_state, $importer) {
-  drupal_add_js(drupal_get_path('module', 'feeds_ui') .'/feeds_ui.js');
-
-  $form = array();
-  $form['#importer'] = $importer;
-  $form['help']['#value'] = feeds_ui_mapping_help();
-
-  // Get mapping sources from parsers and targets from processor, format them
-  // for output.
-  // Some parsers do not define mapping sources but let them define on the fly.
-  if ($sources = $importer->parser->getMappingSources()) {
-    $source_options = _feeds_ui_format_options($sources);
-    foreach ($sources as $k => $source) {
-      $legend['sources'][$k]['name']['#value'] = empty($source['name']) ? $k : $source['name'];
-      $legend['sources'][$k]['description']['#value'] = empty($source['description']) ? '' : $source['description'];
-    }
-  }
-  else {
-    $legend['sources']['#value'] = t('This parser supports free source definitions. Enter the name of the source field in lower case into the Source text field above.');
-  }
-  $targets = $importer->processor->getMappingTargets();
-  $target_options = _feeds_ui_format_options($targets);
-  foreach ($targets as $k => $target) {
-    $legend['targets'][$k]['name']['#value'] = empty($target['name']) ? $k : $target['name'];
-    $legend['targets'][$k]['description']['#value'] = empty($target['description']) ? '' : $target['description'];
-  }
-
-  $form['legendset'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Legend'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-    '#tree' => TRUE,
-  );
-  $form['legendset']['legend'] = $legend;
-
-  // Add unique and remove forms to mappings.
-  $mappings = $importer->processor->getMappings();
-  $form['unique_flags'] = $form['remove_flags'] = array(
-    '#tree' => TRUE,
-  );
-
-  if (is_array($mappings)) {
-    foreach ($mappings as $i => $mapping) {
-
-      $mappings[$i]['source'] = isset($source_options) ? $source_options[$mappings[$i]['source']] : $mappings[$i]['source'];
-      $mappings[$i]['target'] = $target_options[$mappings[$i]['target']];
-      $param = array(
-        'processor' => $importer->processor,
-        'mapping' => $mapping,
-      );
-
-      if (isset($targets[$mapping['target']]['optional_unique']) && $targets[$mapping['target']]['optional_unique'] === TRUE) {
-
-        $form['unique_flags'][$i] = array(
-          '#type' => 'checkbox',
-          '#default_value' => !empty($mapping['unique']),
-          '#attributes' => array('class' => 'feeds-ui-trigger-submit'),
-        );
-      }
-      $form['remove_flags'][$i] = array(
-        '#type' => 'checkbox',
-        '#title' => t('Remove'),
-        '#prefix' => '<div class="feeds-ui-checkbox-link">',
-        '#suffix' => '</div>',
-      );
-    }
-  }
-
-  $form['#mappings'] = $mappings;
-  $form['#targets'] = $targets;
-  if ($sources) {
-    $form['source'] = array(
-      '#type' => 'select',
-      '#options' => array('' => t('Select a source')) + $source_options,
-    );
-  }
-  else {
-    $form['source'] = array(
-      '#type' => 'textfield',
-      '#size' => 20,
-      '#default_value' => t('Name of source field'),
-      '#attributes' => array('class' => 'hide-text-on-focus'),
-    );
-  }
-  $form['target'] = array(
-    '#type' => 'select',
-    '#options' => array('' => t('Select a target')) + _feeds_ui_format_options($targets),
-  );
-  $form['add'] = array(
-    '#type' => 'submit',
-    '#value' => t('Add'),
-    '#submit' => array('feeds_ui_mapping_form_add_submit'),
-  );
-  $form['save'] = array(
-    '#type' => 'submit',
-    '#value' => t('Save'),
-    '#attributes' => array('class' => 'feeds-ui-hidden-submit'),
-  );
-  return $form;
-}
-
-/**
- * Submit handler for add button on feeds_ui_mapping_form().
- */
-function feeds_ui_mapping_form_add_submit($form, &$form_state) {
-  $importer = $form['#importer'];
-  try {
-    $importer->processor->addMapping($form_state['values']['source'], $form_state['values']['target']);
-    $importer->processor->save();
-    drupal_set_message(t('Mapping has been added.'));
-  }
-  catch (Exception $e) {
-    drupal_set_message($e->getMessage(), 'error');
-  }
-}
-
-/**
- * Submit handler for save button on feeds_ui_mapping_form().
- */
-function feeds_ui_mapping_form_submit($form, &$form_state) {
-  $processor = $form['#importer']->processor;
-  $mappings = $processor->config['mappings'];
-  // We may set some unique flags to mappings that we remove in the subsequent
-  // step, that's fine.
-  if (isset($form_state['values']['unique_flags'])) {
-    foreach ($form_state['values']['unique_flags'] as $k => $v) {
-      $processor->setUnique($mappings[$k]['source'], $mappings[$k]['target'], $v);
-    }
-  }
-
-  foreach ($form_state['values']['remove_flags'] as $k => $v) {
-    if ($v) {
-      $processor->removeMapping($mappings[$k]['source'], $mappings[$k]['target']);
-    }
-  }
-  drupal_set_message(t('Your changes have been saved.'));
-  $processor->save();
-}
-
-/**
- * Walk the result of FeedsParser::getMappingSources() or
- * FeedsProcessor::getMappingTargets() and format them into
- * a Form API options array.
- */
-function _feeds_ui_format_options($options) {
-  $result = array();
-  foreach ($options as $k => $v) {
-    if (is_array($v) && !empty($v['name'])) {
-      $result[$k] = $v['name'];
-    }
-    elseif (is_array($v)) {
-      $result[$k] = $k;
-    }
-    else {
-      $result[$k] = $v;
-    }
-  }
-  return $result;
-}
-
-/**
  * Theme feeds_ui_overview_form().
  */
 function theme_feeds_ui_overview_form($form) {
@@ -749,79 +572,3 @@
   $output .= '</div>';
   return $output;
 }
-
-/**
- * Theme function for feeds_ui_mapping_form().
- */
-function theme_feeds_ui_mapping_form($form) {
-
-  // Build the actual mapping table.
-  $header = array(
-    t('Source'),
-    t('Target'),
-    t('Unique target'),
-    '&nbsp;',
-  );
-  $rows = array();
-  if (is_array($form['#mappings'])) {
-    foreach ($form['#mappings'] as $i => $mapping) {
-      $rows[] = array(
-        $mapping['source'],
-        $mapping['target'],
-        drupal_render($form['unique_flags'][$i]),
-        drupal_render($form['remove_flags'][$i]),
-      );
-    }
-  }
-  if (!count($rows)) {
-    $rows[] = array(
-      array(
-        'colspan' => 4,
-        'data' => t('No mappings defined.'),
-      ),
-    );
-  }
-  $rows[] = array(
-    drupal_render($form['source']),
-    drupal_render($form['target']),
-    '',
-    drupal_render($form['add']),
-  );
-  $output = '<div class="help feeds-admin-ui""'. drupal_render($form['help']) .'</div>';
-  $output .= theme('table', $header, $rows);
-
-  // Build the help table that explains available sources.
-  $legend = '';
-  $rows = array();
-  foreach (element_children($form['legendset']['legend']['sources']) as $k) {
-    $rows[] = array(
-      drupal_render($form['legendset']['legend']['sources'][$k]['name']),
-      drupal_render($form['legendset']['legend']['sources'][$k]['description']),
-    );
-  }
-  if (count($rows)) {
-    $legend .= '<h4>'. t('Sources') .'</h4>';
-    $legend .= theme('table', array(t('Name'), t('Description')), $rows);
-  }
-
-  // Build the help table that explains available targets.
-  $rows = array();
-  foreach (element_children($form['legendset']['legend']['targets']) as $k) {
-    $rows[] = array(
-      drupal_render($form['legendset']['legend']['targets'][$k]['name']),
-      drupal_render($form['legendset']['legend']['targets'][$k]['description']),
-    );
-  }
-  $legend .= '<h4>'. t('Targets') .'</h4>';
-  $legend .= theme('table', array(t('Name'), t('Description')), $rows);
-
-  // Stick tables into collapsible fieldset.
-  $form['legendset']['legend'] = array(
-    '#value' => '<div>'. $legend .'</div>',
-  );
-
-  $output .= drupal_render($form['legendset']);
-
-  $output .= drupal_render($form);
-  return $output;
-}
Index: includes/FeedsBatch.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/includes/FeedsBatch.inc,v
retrieving revision 1.12
diff -u -r1.12 FeedsBatch.inc
--- includes/FeedsBatch.inc	20 Jun 2010 01:10:29 -0000	1.12
+++ includes/FeedsBatch.inc	6 Jul 2010 09:33:03 -0000
@@ -180,4 +180,20 @@
     $this->items[] = $item;
     $this->total = count($this->items);
   }
+
+  /**
+   * Get mapping sources after the items has been populated
+   */
+  public function getMappingSources() {
+    $sources = array();
+    if ($this->total > 0){
+      foreach($this->items[0] as $k => $v) {
+        $sources[$k] = array(
+          'title' => $k,
+          'description' => '',
+        );
+      }
+    }
+    return $sources;
+  }
 }
Index: includes/FeedsConfigurable.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/includes/FeedsConfigurable.inc,v
retrieving revision 1.12
diff -u -r1.12 FeedsConfigurable.inc
--- includes/FeedsConfigurable.inc	28 Feb 2010 17:16:25 -0000	1.12
+++ includes/FeedsConfigurable.inc	5 Jul 2010 19:18:13 -0000
@@ -188,14 +188,16 @@
  *   FeedsConfigurable object.
  * @param
  *   The parent object to perform the save on.
+ * @param
+ *   The form_id that should be rendered.
  *
  * @return
  *   Rendered config form, if available. Empty string otherwise.
  */
-function feeds_get_config_form($configurable) {
+function feeds_get_config_form($configurable, $form_id = 'configForm') {
   $form_state = array();
-  if ($configurable->configForm($form_state)) {
-    return drupal_get_form(get_class($configurable) .'_feeds_config_form', $configurable);
+  if ($configurable->$form_id($form_state)) {
+    return drupal_get_form(get_class($configurable) .'_feeds_config_form', $configurable, $form_id);
   }
   return '';
 }
@@ -210,9 +212,11 @@
  *   FeedsConfigurable object.
  * @param
  *   The object to perform the save() operation on.
+ * @param
+ *   The form_id that should be rendered.
  */
-function feeds_config_form(&$form_state, $configurable) {
-  $form = $configurable->configForm($form_state);
+function feeds_config_form(&$form_state, $configurable, $form_id) {
+  $form = $configurable->$form_id($form_state);
   $form['#configurable'] = $configurable;
   $form['#validate'] = array('feeds_config_form_validate');
   $form['#submit'] = array('feeds_config_form_submit');
Index: includes/FeedsSource.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/includes/FeedsSource.inc,v
retrieving revision 1.13
diff -u -r1.13 FeedsSource.inc
--- includes/FeedsSource.inc	19 Jun 2010 19:40:43 -0000	1.13
+++ includes/FeedsSource.inc	6 Jul 2010 06:39:56 -0000
@@ -287,5 +287,5 @@
         $this->importer->$type->sourceFormValidate($values[$class]);
       }
     }
-  }
+  }  
 }
Index: plugins/FeedsDataProcessor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsDataProcessor.inc,v
retrieving revision 1.13
diff -u -r1.13 FeedsDataProcessor.inc
--- plugins/FeedsDataProcessor.inc	16 May 2010 21:51:58 -0000	1.13
+++ plugins/FeedsDataProcessor.inc	5 Jul 2010 14:45:25 -0000
@@ -255,6 +255,7 @@
       'update_existing' => 0,
       'expire' => FEEDS_EXPIRE_NEVER, // Don't expire items by default.
       'mappings' => array(),
+      'mapping_on_import' => 0,
     );
   }
 
Index: plugins/FeedsFeedNodeProcessor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsFeedNodeProcessor.inc,v
retrieving revision 1.12
diff -u -r1.12 FeedsFeedNodeProcessor.inc
--- plugins/FeedsFeedNodeProcessor.inc	28 Apr 2010 22:18:30 -0000	1.12
+++ plugins/FeedsFeedNodeProcessor.inc	5 Jul 2010 14:45:25 -0000
@@ -107,6 +107,7 @@
       'content_type' => '',
       'update_existing' => 0,
       'mappings' => array(),
+      'mapping_on_import' => 0,
     );
   }
 
Index: plugins/FeedsNodeProcessor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsNodeProcessor.inc,v
retrieving revision 1.38
diff -u -r1.38 FeedsNodeProcessor.inc
--- plugins/FeedsNodeProcessor.inc	19 Jun 2010 18:03:41 -0000	1.38
+++ plugins/FeedsNodeProcessor.inc	5 Jul 2010 14:45:25 -0000
@@ -146,6 +146,7 @@
       'expire' => FEEDS_EXPIRE_NEVER,
       'mappings' => array(),
       'author' => 0,
+      'mapping_on_import' => 0,
     );
   }
 
Index: plugins/FeedsProcessor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsProcessor.inc,v
retrieving revision 1.11
diff -u -r1.11 FeedsProcessor.inc
--- plugins/FeedsProcessor.inc	19 Jun 2010 15:57:13 -0000	1.11
+++ plugins/FeedsProcessor.inc	6 Jul 2010 09:35:00 -0000
@@ -130,7 +130,10 @@
    * Declare default configuration.
    */
   public function configDefaults() {
-    return array('mappings' => array());
+    return array(
+      'mappings' => array(),
+      'mapping_on_import' => 0,
+    );
   }
 
   /**
@@ -273,4 +276,215 @@
     }
     $loaded = TRUE;
   }
+
+  /**
+   * Overwrite parent::addConfig()
+   * This is to handle config submission in mappingForm
+   */
+  public function addConfig($config) {
+    parent::addConfig($config);
+
+    $mappings = $this->config['mappings'];
+    // We may set some unique flags to mappings that we remove in the subsequent
+    // step, that's fine.
+    if (isset($config['unique_flags'])) {
+      foreach ($config['unique_flags'] as $k => $v) {
+        $this->setUnique($mappings[$k]['source'], $mappings[$k]['target'], $v);
+      }
+    }
+
+    if (isset($config['remove_flags'])) {
+      foreach ($config['remove_flags'] as $k => $v) {
+        if ($v) {
+          $this->removeMapping($mappings[$k]['source'], $mappings[$k]['target']);
+        }
+      }
+    }
+  }
+
+  /**
+   * Render the mapping form.
+   * This function should NOT be overwritten.
+   * @param
+   *   The form object.
+   * @param
+   *   The location from where this function is called. For now, it will be passed either
+   *   'import' or 'config'
+   * @param
+   *   The batch object that contains populated items that has been fetched and parsed.
+   *   This will only be handled if the first parameter is NOT 'config'
+   */
+  public function mappingForm($form, $loc_id = 'config', $batch = NULL) {
+    drupal_add_js(drupal_get_path('module', 'feeds_ui') .'/feeds_ui.js');
+  	
+  	// Get the FeedsImporter object
+  	$importer = feeds_importer($this->id);
+  	
+    $form = array();
+    if ($loc_id == 'config') {
+      // Mapping on import checkbox
+      $form['mapping_on_import'] = array(
+        '#type' => 'checkbox',
+        '#title' => 'Define mapping on import',
+        '#description' => 'If this is checked, the mapping form here will be disabled and instead user will be asked for the mapping configuration after the first import.',
+        '#attributes' => array('class' => 'feeds-ui-trigger-submit'),
+        '#weight' => -100,
+        '#default_value' => $importer->processor->config['mapping_on_import'],
+      );
+    }
+
+    if ($loc_id != 'config' || !$importer->processor->config['mapping_on_import']) {
+      $form['#theme'] = 'feeds_mapping_form';
+      $form['help']['#value'] = feeds_mapping_form_help();
+
+      // Get mapping sources from parsers or batch and targets from processor, format them
+      // for output.
+      // Some parsers do not define mapping sources but let them define on the fly.
+      if ($loc_id == 'config' || empty($batch)) {
+        $sources = $importer->parser->getMappingSources();
+      }
+      else {
+        $sources = $batch->getMappingSources();
+      }
+
+      if ($sources) {
+        $source_options = _feeds_mapping_form_format_options($sources);
+        foreach ($sources as $k => $source) {
+          $legend['sources'][$k]['name']['#value'] = empty($source['name']) ? $k : $source['name'];
+          $legend['sources'][$k]['description']['#value'] = empty($source['description']) ? '' : $source['description'];
+        }
+      }
+      else {
+        $legend['sources']['#value'] = t('This parser supports free source definitions. Enter the name of the source field in lower case into the Source text field above.');
+      }
+      $targets = $importer->processor->getMappingTargets();
+      $target_options = _feeds_mapping_form_format_options($targets);
+      foreach ($targets as $k => $target) {
+        $legend['targets'][$k]['name']['#value'] = empty($target['name']) ? $k : $target['name'];
+        $legend['targets'][$k]['description']['#value'] = empty($target['description']) ? '' : $target['description'];
+      }
+
+      $form['legendset'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Legend'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+        '#tree' => TRUE,
+      );
+      $form['legendset']['legend'] = $legend;
+
+      // Add unique and remove forms to mappings.
+      $mappings = $importer->processor->getMappings();
+      $form['unique_flags'] = $form['remove_flags'] = array(
+        '#tree' => TRUE,
+      );
+
+      if (is_array($mappings)) {
+        foreach ($mappings as $i => $mapping) {
+
+          $mappings[$i]['source'] = isset($source_options) ? $source_options[$mappings[$i]['source']] : $mappings[$i]['source'];
+          $mappings[$i]['target'] = $target_options[$mappings[$i]['target']];
+          $param = array(
+            'processor' => $importer->processor,
+            'mapping' => $mapping,
+          );
+
+          if (isset($targets[$mapping['target']]['optional_unique']) && $targets[$mapping['target']]['optional_unique'] === TRUE) {
+
+            $form['unique_flags'][$i] = array(
+              '#type' => 'checkbox',
+              '#default_value' => !empty($mapping['unique']),
+              '#attributes' => array('class' => 'feeds-ui-trigger-submit'),
+            );
+          }
+          $form['remove_flags'][$i] = array(
+            '#type' => 'checkbox',
+            '#title' => t('Remove'),
+            '#prefix' => '<div class="feeds-ui-checkbox-link">',
+            '#suffix' => '</div>',
+          );
+        }
+      }
+
+      $form['#mappings'] = $mappings;
+      $form['#targets'] = $targets;
+      if ($sources) {
+        $form['source'] = array(
+          '#type' => 'select',
+          '#options' => array('' => t('Select a source')) + $source_options,
+        );
+      }
+      else {
+        $form['source'] = array(
+          '#type' => 'textfield',
+          '#size' => 20,
+          '#default_value' => t('Name of source field'),
+          '#attributes' => array('class' => 'hide-text-on-focus'),
+        );
+      }
+      $form['target'] = array(
+        '#type' => 'select',
+        '#options' => array('' => t('Select a target')) + _feeds_mapping_form_format_options($targets),
+      );
+      $form['add'] = array(
+        '#type' => 'submit',
+        '#value' => t('Add'),
+        '#submit' => array('feeds_mapping_form_add_submit'),
+      );
+    }
+
+    $form['save'] = array(
+      '#type' => 'submit',
+      '#value' => t('Save'),
+      '#attributes' => array('class' => 'feeds-ui-hidden-submit'),
+    );
+
+    return $form;
+  }
+}
+
+/**
+ * Submit handler for add button on feeds_mapping_form().
+ */
+function feeds_mapping_form_add_submit($form, &$form_state) {
+  try {
+    $form['#configurable']->addMapping($form_state['values']['source'], $form_state['values']['target']);
+    $form['#configurable']->save();
+    drupal_set_message(t('Mapping has been added.'));
+  }
+  catch (Exception $e) {
+    drupal_set_message($e->getMessage(), 'error');
+  }
+}
+
+/**
+ * Walk the result of FeedsParser::getMappingSources() or
+ * FeedsProcessor::getMappingTargets() and format them into
+ * a Form API options array.
+ */
+function _feeds_mapping_form_format_options($options) {
+  $result = array();
+  foreach ($options as $k => $v) {
+    if (is_array($v) && !empty($v['name'])) {
+      $result[$k] = $v['name'];
+    }
+    elseif (is_array($v)) {
+      $result[$k] = $k;
+    }
+    else {
+      $result[$k] = $v;
+    }
+  }
+  return $result;
+}
+
+/**
+ * Help text for mapping.
+ */
+function feeds_mapping_form_help() {
+  return t('
+  <p>
+  Define which elements of a single item of a feed (= <em>Sources</em>) map to which content pieces in Drupal (= <em>Targets</em>). Make sure that at least one definition has a <em>Unique target</em>. A unique target means that a value for a target can only occur once. E. g. only one item with the URL <em>http://example.com/story/1</em> can exist.
+  </p>
+  ');
 }
Index: plugins/FeedsTermProcessor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsTermProcessor.inc,v
retrieving revision 1.9
diff -u -r1.9 FeedsTermProcessor.inc
--- plugins/FeedsTermProcessor.inc	28 Apr 2010 22:18:30 -0000	1.9
+++ plugins/FeedsTermProcessor.inc	5 Jul 2010 14:45:25 -0000
@@ -126,6 +126,7 @@
       'vocabulary' => 0,
       'update_existing' => 0,
       'mappings' => array(),
+      'mapping_on_import' => 0,
     );
   }
 
Index: plugins/FeedsUserProcessor.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feeds/plugins/FeedsUserProcessor.inc,v
retrieving revision 1.12
diff -u -r1.12 FeedsUserProcessor.inc
--- plugins/FeedsUserProcessor.inc	19 Jun 2010 15:57:13 -0000	1.12
+++ plugins/FeedsUserProcessor.inc	5 Jul 2010 14:45:25 -0000
@@ -117,6 +117,7 @@
       'update_existing' => FALSE,
       'status' => 1,
       'mappings' => array(),
+      'mapping_on_import' => 0,
     );
   }