Index: pifr.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/pifr.install,v
retrieving revision 1.38
diff -u -r1.38 pifr.install
--- pifr.install	3 Nov 2009 16:22:22 -0000	1.38
+++ pifr.install	12 Nov 2009 21:32:16 -0000
@@ -422,7 +422,13 @@
   if (!isset($sandbox['progress'])) {
     $sandbox['progress'] = 0;
     $sandbox['current_log_id'] = 0;
-    $sandbox['max'] = db_result(db_query('SELECT COUNT(log_id) FROM {pifr_log_old}'));
+    // Join other tables to ensure same count, even with half filled data.
+    $sandbox['max'] = db_result(db_query('SELECT COUNT(log_id)
+                                          FROM {pifr_log_old} l
+                                          JOIN {pifr_file_old} o
+                                            ON l.file_id = o.file_id
+                                          JOIN {pifr_file} f
+                                            ON o.server_file_id = f.client_identifier'));
   }
 
   // Query is quite intensive, go through in large batches.