Index: feedapi_mapper.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/feedapi_mapper.module,v
retrieving revision 1.2.2.14
diff -u -p -r1.2.2.14 feedapi_mapper.module
--- feedapi_mapper.module	4 Aug 2009 20:03:52 -0000	1.2.2.14
+++ feedapi_mapper.module	7 Aug 2009 09:56:43 -0000
@@ -90,7 +90,7 @@ function feedapi_mapper_nodeapi(&$node, 
     case 'prepare':
       if (isset($node->feedapi) && $node->feedapi->feed_item) {
         $feed_node = node_load($node->feedapi->feed_nid);
-        $node = feedapi_mapper_map($feed_node, $node->feedapi->feed_item, $node);
+        $node = feedapi_mapper_map($feed_node, 'feedapi_node', $node->feedapi->feed_item, $node);
       }
       break;
   }
@@ -157,7 +157,7 @@ function feedapi_mapper_access_mapper($n
  * @return 
  *   The target object with elements populated by mappers.
  */
-function feedapi_mapper_map($feed_node, $item, $target = array()) {
+function feedapi_mapper_map($feed_node, $processor, $item, $target = array()) {
   $mapping = feedapi_mapper_load_mapping($feed_node);
   if ($mapping['mapping']) {
     // Load available mappers.
@@ -171,7 +171,7 @@ function feedapi_mapper_map($feed_node, 
         $element_path = unserialize($element_path);
         // Get the feed item element on $element_path and pass it into the mapping function.
         $feed_item_element = feedapi_mapper_get_element($element_path, $item);
-        $target = call_user_func($field[0] .'_feedapi_mapper', 'map', $feed_node, $target, $feed_item_element, $field[1], isset($field[2]) ? $field[2] : NULL);
+        $target = call_user_func($field[0] .'_feedapi_mapper', 'map', $feed_node, $processor, $target, $feed_item_element, $field[1], isset($field[2]) ? $field[2] : NULL);
       }
     }
   }
Index: mappers/feedapi_mapper_content.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/mappers/feedapi_mapper_content.inc,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 feedapi_mapper_content.inc
--- mappers/feedapi_mapper_content.inc	14 Jul 2009 17:25:26 -0000	1.2.2.1
+++ mappers/feedapi_mapper_content.inc	7 Aug 2009 09:56:43 -0000
@@ -6,7 +6,7 @@
  *
  * @see hook_feedapi_mapper()
  */
-function content_feedapi_mapper($op, $feed_node, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
+function content_feedapi_mapper($op, $feed_node, $active_processor = NULL, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
 
   // Only map nodes.
   if (!$node_type = feedapi_mapper_get_item_node_type($feed_node)) {
@@ -38,6 +38,13 @@ function content_feedapi_mapper($op, $fe
     // decided to map to and $field_element is the feed item element the user has decided to map.
     // We just need to put the two things together. The data structure here depends a lot on
     // CCK. We stick the value in $feed_element into $node->$field_name[0]['value'].
+
+    // Checks processor compatibility.
+    if ($active_processor != 'feedapi_node') {
+      return;
+    }
+
+
     $field = isset($node->$field_name) ? $node->$field_name : array();
     if (is_array($feed_element)) {
       $i = 0;
Index: mappers/feedapi_mapper_date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/mappers/feedapi_mapper_date.inc,v
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.3 feedapi_mapper_date.inc
--- mappers/feedapi_mapper_date.inc	27 Jul 2009 15:47:35 -0000	1.2.2.3
+++ mappers/feedapi_mapper_date.inc	7 Aug 2009 09:56:44 -0000
@@ -6,7 +6,7 @@
  *
  * @see hook_feedapi_mapper()
  */
-function date_feedapi_mapper($op, $feed_node, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
+function date_feedapi_mapper($op, $feed_node, $active_processor = NULL, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
 
   // Only map nodes.
   if (!$node_type = feedapi_mapper_get_item_node_type($feed_node)) {
@@ -45,6 +45,12 @@ function date_feedapi_mapper($op, $feed_
       return $fields;
 
     case 'map':
+
+      // Checks processor compatibility.
+      if ($active_processor != 'feedapi_node') {
+        return;
+      }
+
       if (empty($feed_element)) {
         return $node;
       }
Index: mappers/feedapi_mapper_emimage.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/mappers/feedapi_mapper_emimage.inc,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 feedapi_mapper_emimage.inc
--- mappers/feedapi_mapper_emimage.inc	14 Jul 2009 17:25:26 -0000	1.2.2.1
+++ mappers/feedapi_mapper_emimage.inc	7 Aug 2009 09:56:44 -0000
@@ -6,7 +6,7 @@
  *
  * @see hook_feedapi_mapper()
  */
-function emimage_feedapi_mapper($op, $feed_node, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
+function emimage_feedapi_mapper($op, $feed_node, $active_processor = NULL, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
 
   // Only map nodes.
   if (!$node_type = feedapi_mapper_get_item_node_type($feed_node)) {
@@ -34,6 +34,12 @@ function emimage_feedapi_mapper($op, $fe
       // just for sub_fields
       return TRUE;
     case 'map':
+
+      // Checks processor compatibility.
+      if ($active_processor != 'feedapi_node') {
+        return;
+      }
+
       // Here is where the actual mapping happens.
       if (isset($node->{$field_name})) {
         $items = $node->{$field_name};
Index: mappers/feedapi_mapper_emvideo.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/mappers/feedapi_mapper_emvideo.inc,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 feedapi_mapper_emvideo.inc
--- mappers/feedapi_mapper_emvideo.inc	14 Jul 2009 17:25:26 -0000	1.2.2.1
+++ mappers/feedapi_mapper_emvideo.inc	7 Aug 2009 09:56:44 -0000
@@ -6,7 +6,7 @@
  *
  * @see hook_feedapi_mapper()
  */
-function emvideo_feedapi_mapper($op, $feed_node, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
+function emvideo_feedapi_mapper($op, $feed_node, $active_processor = NULL, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
 
   // Only map nodes.
   if (!$node_type = feedapi_mapper_get_item_node_type($feed_node)) {
@@ -32,6 +32,12 @@ function emvideo_feedapi_mapper($op, $fe
       }
       return FALSE;
     case 'map':
+
+      // Checks processor compatibility.
+      if ($active_processor != 'feedapi_node') {
+        return;
+      }
+
       // Here is where the actual mapping happens.
       if (isset($node->{$field_name})) {
         $items = $node->{$field_name};
Index: mappers/feedapi_mapper_link.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/mappers/feedapi_mapper_link.inc,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 feedapi_mapper_link.inc
--- mappers/feedapi_mapper_link.inc	14 Jul 2009 17:25:26 -0000	1.2.2.1
+++ mappers/feedapi_mapper_link.inc	7 Aug 2009 09:56:44 -0000
@@ -6,7 +6,7 @@
  * 
  * @see hook_feedapi_mapper()
  */
-function link_feedapi_mapper($op, $feed_node, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
+function link_feedapi_mapper($op, $feed_node, $active_processor = NULL, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
   
   // Only map nodes.
   if (!$node_type = feedapi_mapper_get_item_node_type($feed_node)) {
@@ -38,6 +38,12 @@ function link_feedapi_mapper($op, $feed_
     // decided to map to and $field_element is the feed item element the user has decided to map.
     // We just need to put the two things together. The data structure here depends a lot on
     // CCK. We stick the value in $feed_element into $node->$field_name[0]['value'].
+
+    // Checks processor compatibility.
+    if ($active_processor != 'feedapi_node') {
+      return;
+    }
+
     if (!is_array($feed_element)) {
       if (isset($node->$field_name)) {
         $field = $node->$field_name;
Index: mappers/feedapi_mapper_location.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/mappers/feedapi_mapper_location.inc,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 feedapi_mapper_location.inc
--- mappers/feedapi_mapper_location.inc	14 Jul 2009 17:25:26 -0000	1.2.2.1
+++ mappers/feedapi_mapper_location.inc	7 Aug 2009 09:56:44 -0000
@@ -6,7 +6,7 @@
  * 
  * @see hook_feedapi_mapper()
  */
-function location_feedapi_mapper($op, $feed_node, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
+function location_feedapi_mapper($op, $feed_node, $active_processor = NULL, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
 
   // Only map nodes.
   if (!$node_type = feedapi_mapper_get_item_node_type($feed_node)) {
@@ -33,6 +33,11 @@ function location_feedapi_mapper($op, $f
     return FALSE;
   }
   else if ($op == 'map') {
+    // Checks processor compatibility.
+    if ($active_processor != 'feedapi_node') {
+      return;
+    }
+
     if (is_array($feed_element)) {
       foreach ($feed_element as $i => $val) {
         $node->{$field_name}[$i][$sub_field] = $val;
Index: mappers/feedapi_mapper_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/mappers/feedapi_mapper_node.inc,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 feedapi_mapper_node.inc
--- mappers/feedapi_mapper_node.inc	14 Jul 2009 17:25:26 -0000	1.2.2.1
+++ mappers/feedapi_mapper_node.inc	7 Aug 2009 09:56:44 -0000
@@ -12,7 +12,7 @@
  * - if default mapping is removed, nothing is mapped to target (= e. g. body 
  *   stays empty)
  */
-function node_feedapi_mapper($op, $feed_node, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
+function node_feedapi_mapper($op, $feed_node, $active_processor = NULL, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
 
   // Only map nodes.
   if (!$node_type = feedapi_mapper_get_item_node_type($feed_node)) {
@@ -26,6 +26,12 @@ function node_feedapi_mapper($op, $feed_
     return array('title' => t('Title'), 'created' => t('Published date'), 'body' => t('Body'), 'status' => t('Published state'));
   }
   else if ($op == 'map') {
+
+    // Checks processor compatibility.
+    if ($active_processor != 'feedapi_node') {
+      return;
+    }
+
     if (in_array($field_name, array('title', 'body', 'created'))) {
       if (is_string($feed_element) || is_numeric($feed_element)) {
         $node->{$field_name} = $feed_element;
Index: mappers/feedapi_mapper_taxonomy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/mappers/feedapi_mapper_taxonomy.inc,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 feedapi_mapper_taxonomy.inc
--- mappers/feedapi_mapper_taxonomy.inc	14 Jul 2009 17:25:26 -0000	1.2.2.1
+++ mappers/feedapi_mapper_taxonomy.inc	7 Aug 2009 09:56:44 -0000
@@ -6,7 +6,7 @@
  * 
  * @see hook_feedapi_mapper()
  */
-function taxonomy_feedapi_mapper($op, $feed_node, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
+function taxonomy_feedapi_mapper($op, $feed_node, $active_processor = NULL, $node = NULL, $feed_element = array(), $field_name = '', $sub_field = '') {
 
   // Only map nodes.
   if (!$node_type = feedapi_mapper_get_item_node_type($feed_node)) {
@@ -26,6 +26,12 @@ function taxonomy_feedapi_mapper($op, $f
     return FALSE;
   }
   else if ($op == 'map' && $field_name == 'taxonomy') {
+
+    // Checks processor compatibility.
+    if ($active_processor != 'feedapi_node') {
+      return;
+    }
+
     // Todo: some plausibility check of $feed_element
     // Todo: security check of $feed_element
     if (is_string($feed_element)) {