Index: server/pifr_server.file.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/server/pifr_server.file.inc,v
retrieving revision 1.3
diff -u -r1.3 pifr_server.file.inc
--- server/pifr_server.file.inc	19 Jan 2009 01:05:09 -0000	1.3
+++ server/pifr_server.file.inc	19 Jan 2009 08:56:55 -0000
@@ -10,7 +10,7 @@
 /**
  * Insert a new file record obtained from a project client.
  *
- * @param integer $project_id Project client ID.
+ * @param integer $project_client_id Project client ID.
  * @param integer $project_file_id The file ID used to reference the file.
  * @param integer $nid Node ID.
  * @param integer $cid Comment ID.
@@ -18,10 +18,11 @@
  * @param string $filename File name.
  * @return integer The file ID of the inserted file record.
  */
-function pifr_server_file_insert($project_id, $project_file_id, $nid, $cid, $filepath, $filename) {
-  db_query("INSERT INTO {pifr_file} (project_id, project_file_id, nid, cid, filepath, filename, status, received)
-            VALUES (%d, %d, %d, %d, '%s', '%s', %d, %d)",
-            $project_id, $project_file_id, $nid, $cid, $filepath, $filename, PIFR_SERVER_FILE_QUEUED, time());
+function pifr_server_file_insert($project_client_id, $project_file_id, $project_nid, $nid, $cid, $filepath, $filename) {
+  db_query("INSERT INTO {pifr_file}
+            (project_client_id, project_file_id, project_nid, nid, cid, filepath, filename, status, received)
+            VALUES (%d, %d, %d, %d, %d, '%s', '%s', %d, %d)",
+            $project_client_id, $project_file_id, $project_nid, $nid, $cid, $filepath, $filename, PIFR_SERVER_FILE_QUEUED, time());
   $file_id = db_last_insert_id('pifr_file', 'file_id');
   pifr_log_event($file_id, t('Test request received from the project client.'));
   return $file_id;
@@ -58,14 +59,14 @@
  * Get a file by name.
  *
  * @param string $filename File name.
- * @param integer $project_id Project client ID.
+ * @param integer $project_client_id Project client ID.
  * @return mixed File object or FALSE.
  */
-function pifr_server_file_find($filename, $project_id) {
+function pifr_server_file_find($filename, $project_client_id) {
   $result = db_query("SELECT *
                       FROM {pifr_file}
                       WHERE filename LIKE '%s'
-                      AND project_id = %d", $filename, $project_id);
+                      AND project_client_id = %d", $filename, $project_client_id);
   return db_fetch_object($result);
 }
 
Index: server/pifr_server.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/server/pifr_server.install,v
retrieving revision 1.7
diff -u -r1.7 pifr_server.install
--- server/pifr_server.install	19 Jan 2009 04:59:04 -0000	1.7
+++ server/pifr_server.install	19 Jan 2009 08:56:55 -0000
@@ -98,8 +98,8 @@
         'unsigned' => TRUE,
         'not null' => TRUE
       ),
-      'project_id' => array(
-        'description' => t('Reference to project ID.'),
+      'project_client_id' => array(
+        'description' => t('Reference to project client ID.'),
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE
@@ -110,6 +110,12 @@
         'unsigned' => TRUE,
         'not null' => TRUE
       ),
+      'project_nid' => array(
+        'description' => t('Reference to project NID.'),
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE
+      ),
       'client_id' => array(
         'description' => t('Reference to client ID that the file was last sent to.'),
         'type' => 'int',
@@ -117,13 +123,13 @@
         'not null' => TRUE
       ),
       'nid' => array(
-        'description' => t('Reference to project NID.'),
+        'description' => t('Reference to project issue NID.'),
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE
       ),
       'cid' => array(
-        'description' => t('Reference to project CID.'),
+        'description' => t('Reference to project issue CID.'),
         'type' => 'int',
         'unsigned' => FALSE,
         'not null' => TRUE
@@ -199,7 +205,7 @@
       ),
     ),
     'indexes' => array(
-      'project_id' => array('project_id'),
+      'project_client_id' => array('project_client_id'),
       'nid' => array('nid'),
       'status' => array('status')
     ),
Index: server/pifr_server.xmlrpc.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/server/pifr_server.xmlrpc.inc,v
retrieving revision 1.2
diff -u -r1.2 pifr_server.xmlrpc.inc
--- server/pifr_server.xmlrpc.inc	19 Jan 2009 01:05:09 -0000	1.2
+++ server/pifr_server.xmlrpc.inc	19 Jan 2009 08:56:55 -0000
@@ -32,7 +32,7 @@
       $file_already = pifr_server_file_find($file['filename'], $client->client_id);
 
       if (!$file_already) {
-        pifr_server_file_insert($client->client_id, $file['project_file_id'], $file['nid'],
+        pifr_server_file_insert($client->client_id, $file['project_file_id'], $file['project_nid'], $file['nid'],
                                 $file['cid'], $file['filepath'], $file['filename']);
       }
       else {
Index: server/pifr_server.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/server/pifr_server.pages.inc,v
retrieving revision 1.4
diff -u -r1.4 pifr_server.pages.inc
--- server/pifr_server.pages.inc	19 Jan 2009 01:05:09 -0000	1.4
+++ server/pifr_server.pages.inc	19 Jan 2009 08:56:55 -0000
@@ -28,7 +28,7 @@
     $row[] = format_date($event->timestamp, 'small');
     if (!$file_id) {
       $file = pifr_server_file_get($event->file_id);
-      $row[] = l($file->filename, 'pifr/file/' . $file->project_id . '/' . $file->file_id);
+      $row[] = l($file->filename, 'pifr/file/' . $file->project_client_id . '/' . $file->file_id);
     }
     $row[] = $event->message;