Index: mm_cck.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media_mover/mm_cck/Attic/mm_cck.module,v
retrieving revision 1.1.4.2
diff -u -p -r1.1.4.2 mm_cck.module
--- mm_cck.module	11 Dec 2008 02:47:00 -0000	1.1.4.2
+++ mm_cck.module	11 Dec 2008 03:39:45 -0000
@@ -24,7 +24,7 @@ define(MM_CCK_COMPLETE, 3);
  * @param int $nid
  *   special param for processing individual nodes
  */
-function mm_content_media_mover($op, $action = null, $configuration = null, &$file = array(), $running_config = null, $nid = null) {
+function mm_cck_media_mover($op, $action = null, $configuration = null, &$file = array(), $running_config = null, $nid = null) {
   if (module_exists('content')) {
     switch ($op) {
       case 'name':
@@ -40,23 +40,23 @@ function mm_content_media_mover($op, $ac
       case 'config':
         switch ($action) {
           case MM_CCK_HARVEST:
-            return mm_content_config_harvest($action, $configuration);
+            return mm_cck_config_harvest($action, $configuration);
 
           case MM_CCK_COMPLETE:
           case MM_CCK_STORE:
-            return mm_content_config_save_node($action, $configuration, $configuration['verb']);
+            return mm_cck_config_save_node($action, $configuration, $configuration['verb']);
         }
         break;
 
       case 'harvest':
         if ($action == MM_CCK_HARVEST) {
-          return mm_content_harvest($action, $configuration, $running_config, $nid);
+          return mm_cck_harvest($action, $configuration, $running_config, $nid);
         }
         break;
 
       case 'complete':
       case 'storage':
-        return mm_content_node_save($action, $configuration, $file);
+        return mm_cck_node_save($action, $configuration, $file);
 
       case 'delete':
         if ($action == MM_CCK_STORE) {
@@ -74,7 +74,7 @@ function mm_content_media_mover($op, $ac
 /**
  * return the configuration form for harvesting from CCK fields
  */
-function mm_cckconfig_harvest($action, $configuration) {
+function mm_cck_config_harvest($action, $configuration) {
   $form = array();
   $form['mm_harvest_conf'] = array(
     '#type' => 'fieldset',
@@ -176,7 +176,7 @@ function mm_cck_harvest($action, $config
         }
 
         // @TODO this has to be adapted for D6 SQL structure
-        $results = db_query('SELECT f.filepath, n.nid FROM {files} f
+        $results = db_query('SELECT f.filepath, n.nid, f.fid FROM {files} f
           LEFT JOIN '. $db_info['table'] .' c ON c.'. $db_info['columns']['fid']['column'] .' = f.fid
           LEFT JOIN {node} n ON c.nid = n.nid
           LEFT JOIN {media_mover_files} m ON m.fid = f.fid AND m.cid = %d
@@ -190,6 +190,7 @@ function mm_cck_harvest($action, $config
           $files[] = array(
             'harvest_file' => $result['filepath'],
             'nid' => $result['nid'],
+            'fid' => $result['fid'],
           );
         }
       break;