From 82ccb5452cd953d71c49e0075d9ecbbb2f6b5456 Mon Sep 17 00:00:00 2001
From: Vincent Zanotti <vincent.zanotti@m4x.org>
Date: Fri, 10 Apr 2009 01:59:55 +0200
Subject: [PATCH] Updates the CSVImporter so that callbacks for cell generation
 have access to values that are already available.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
---
 classes/csvimporter.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/csvimporter.php b/classes/csvimporter.php
index 0f576a0..542de1d 100644
--- a/classes/csvimporter.php
+++ b/classes/csvimporter.php
@@ -64,12 +64,12 @@ class CSVImporter
         return true;
     }
 
-    private function getValue($line, $key, $action)
+    private function getValue($line, $partial_ops, $key, $action)
     {
         if (@array_key_exists($action, $line)) {
             $value = $line[$action];
         } elseif (is_callable($action, false)) {
-            $value = call_user_func($action, $line, $key);
+            $value = call_user_func($action, $line, $partial_ops, $key);
         } else {
             $value = $action;
         }
@@ -83,7 +83,7 @@ class CSVImporter
     {
         $ops = array();
         foreach ($relation as $key=>$ref) {
-            $ops[$key] = $this->getValue($line, $key, $ref);
+            $ops[$key] = $this->getValue($line, $ops, $key, $ref);
         }
         return $ops;
     }
@@ -92,7 +92,7 @@ class CSVImporter
     {
         $ops = array();
         foreach ($relation as $key=>$ref) {
-            $value = $this->getValue($line, $key, $ref);
+            $value = $this->getValue($line, $ops, $key, $ref);
             if (!is_null($value) && $value != 'NULL') {
                 $value = "'" . addslashes($value) . "'";
             }
-- 
2.1.4