module updated to Drupal 7

1 files changed, 107 insertions, 46 deletions

diff --git a/full_download.inc b/full_download.inc
index a269bd8..fa8c87c 100755
--- a/full_download.inc
+++ b/full_download.inc
@@ -9,52 +9,116 @@ function textbook_companion_download_full_chapter()
   $PENDING_PATH = 'PENDING/';
 
   /* get example data */
-  $chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE id = %d", $chapter_id);
-  $chapter_data = db_fetch_object($chapter_q);
+
+  /*$chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE id = %d", $chapter_id);
+  $chapter_data = db_fetch_object($chapter_q);*/
+
+	$query = db_select('textbook_companion_chapter');
+	$query->fields('textbook_companion_chapter');
+	$query->condition('id', $chapter_id);
+	$chapter_q = $query->execute();
+	$chapter_data =$chapter_q->fetchObject();
+
   $CH_PATH = 'CH' . $chapter_data->number . '/';
 
   /* zip filename */
   $zip_filename = $root_path . 'zip-' . time() . '-' . rand(0, 999999) . '.zip';
 
   /* creating zip archive on the server */
-  $zip = new ZipArchive;
+  $zip = new ZipArchive();
   $zip->open($zip_filename, ZipArchive::CREATE);
 
   /* approved examples */
-  $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d AND approval_status = 1", $chapter_id);
-  while ($example_row = db_fetch_object($example_q))
+
+  /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d AND approval_status = 1", $chapter_id);*/
+	$query = db_select('textbook_companion_example');
+	$query->fields('textbook_companion_example');
+	$query->condition('chapter_id', $chapter_id);
+	$query->condition('approval_status', 1);
+	$example_q = $query->execute();
+
+  while ($example_row = $example_q->fetchObject())
   {
     $EX_PATH = 'EX' . $example_row->number . '/';
-    $example_files_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE example_id = %d", $example_row->id);
-    $example_dependency_files_q = db_query("SELECT * FROM {textbook_companion_example_dependency} WHERE example_id = %d", $example_row->id);
-    while ($example_files_row = db_fetch_object($example_files_q))
+
+    /*$example_files_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE example_id = %d", $example_row->id);*/
+
+	$query = db_select('textbook_companion_example_files');
+	$query->fields('textbook_companion_example_files');
+	$query->condition('example_id', $example_row->id);
+	$example_files_q = $query->execute();
+
+    /*$example_dependency_files_q = db_query("SELECT * FROM {textbook_companion_example_dependency} WHERE example_id = %d", $example_row->id);*/
+	$query = db_select('textbook_companion_example_dependency');
+	$query->fields('textbook_companion_example_dependency');
+	$query->condition('example_id', $example_row->id);
+	$example_dependency_files_q = $query->execute();
+
+    while ($example_files_row =$example_files_q->fetchObject())
     {
       $zip->addFile($root_path . $example_files_row->filepath, $APPROVE_PATH . $CH_PATH . $EX_PATH . $example_files_row->filename);
     }
     /* dependency files */
-    while ($example_dependency_files_row = db_fetch_object($example_dependency_files_q))
+    while ($example_dependency_files_row = $example_dependency_files_q->fetchObject())
     {
-      $dependency_file_data = db_fetch_object(db_query("SELECT * FROM {textbook_companion_dependency_files} WHERE id = %d LIMIT 1", $example_dependency_files_row->dependency_id));
+      /*$dependency_file_data = db_fetch_object(db_query("SELECT * FROM {textbook_companion_dependency_files} WHERE id = %d LIMIT 1", $example_dependency_files_row->dependency_id));*/
+
+	$query = db_select('textbook_companion_dependency_files');
+	$query->fields('textbook_companion_dependency_files');
+	$query->condition('id', $example_dependency_files_row->dependency_id);
+	$query->range(0, 1);
+	$result = $query->execute();
+	$dependency_file_data=$result->fetchObject();
+
       if ($dependency_file_data)
         $zip->addFile($root_path . $dependency_file_data->filepath, $APPROVE_PATH . $CH_PATH . $EX_PATH . 'DEPENDENCIES/' . $dependency_file_data->filename);
     }
   }
 
   /* unapproved examples */
-  $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d AND approval_status = 0", $chapter_id);
-  while ($example_row = db_fetch_object($example_q))
+
+  /*$example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d AND approval_status = 0", $chapter_id);*/
+
+	$query = db_select('textbook_companion_example');
+	$query->fields('textbook_companion_example');
+	$query->condition('chapter_id', $chapter_id);
+	$query->condition('approval_status', 0);
+	$example_q = $query->execute();
+
+  while ($example_row =$example_q->fetchObject())
   {
     $EX_PATH = 'EX' . $example_row->number . '/';
-    $example_files_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE example_id = %d", $example_row->id);
-    $example_dependency_files_q = db_query("SELECT * FROM {textbook_companion_example_dependency} WHERE example_id = %d", $example_row->id);
-    while ($example_files_row = db_fetch_object($example_files_q))
+
+    /*$example_files_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE example_id = %d", $example_row->id);*/
+
+	$query = db_select('textbook_companion_example_files');
+	$query->fields('textbook_companion_example_files');
+	$query->condition('example_id', $example_row->id);
+$	$example_files_q = $query->execute();
+
+    /*$example_dependency_files_q = db_query("SELECT * FROM {textbook_companion_example_dependency} WHERE example_id = %d", $example_row->id);*/
+
+	$query = db_select('textbook_companion_example_dependency');
+	$query->fields('textbook_companion_example_dependency');
+	$query->condition('example_id', $example_row->id);
+	$example_dependency_files_q = $query->execute();
+
+    while ($example_files_row = $example_files_q->fetchObject())
     {
       $zip->addFile($root_path . $example_files_row->filepath, $PENDING_PATH . $CH_PATH . $EX_PATH . $example_files_row->filename);
     }
     /* dependency files */
-    while ($example_dependency_files_row = db_fetch_object($example_dependency_files_q))
+    while ($example_dependency_files_row = $example_dependency_files_q->fetchObject())
     {
-      $dependency_file_data = db_fetch_object(db_query("SELECT * FROM {textbook_companion_dependency_files} WHERE id = %d LIMIT 1", $example_dependency_files_row->dependency_id));
+      /*$dependency_file_data = db_fetch_object(db_query("SELECT * FROM {textbook_companion_dependency_files} WHERE id = %d LIMIT 1", $example_dependency_files_row->dependency_id));*/
+
+	$query = db_select('textbook_companion_dependency_files');
+	$query->fields('textbook_companion_dependency_files');
+	$query->condition('id', $example_dependency_files_row->dependency_id);
+	$query->range(0, 1);
+	$result = $query->execute();
+	$dependency_file_data=$result->fetchObject();
+
       if ($dependency_file_data)
         $zip->addFile($root_path . $dependency_file_data->filepath, $PENDING_PATH . $CH_PATH . $EX_PATH . 'DEPENDENCIES/' . $dependency_file_data->filename);
     }
@@ -84,6 +148,7 @@ function textbook_companion_download_full_chapter()
   }
 }
 
+
 function textbook_companion_download_full_book()
 {
   $book_id = arg(2);
@@ -91,65 +156,61 @@ function textbook_companion_download_full_book()
   $APPROVE_PATH = 'APPROVED/';
   $PENDING_PATH = 'PENDING/';
   /* get example data */
-  $book_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE id = %d", $book_id);
-  $book_data = db_fetch_object($book_q);
+  $book_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE id = :book_id", array(':book_id' => $book_id));
+  $book_data = $book_q->fetchObject();
   $BK_PATH = $book_data->book . '/';
-
   /* zip filename */
   $zip_filename = $root_path . 'zip-' . time() . '-' . rand(0, 999999) . '.zip';
-
   /* creating zip archive on the server */
   $zip = new ZipArchive;
   $zip->open($zip_filename, ZipArchive::CREATE);
-
   /* approved examples */
-  $chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE preference_id = %d", $book_id);
-  while ($chapter_row = db_fetch_object($chapter_q))
+  $chapter_q = db_query("SELECT * FROM {textbook_companion_chapter} WHERE preference_id = :book_id", array(':book_id' => $book_id));
+  while ($chapter_row = $chapter_q->fetchObject())
   {
     $CH_PATH = 'CH' . $chapter_row->number . '/';
-    $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d AND approval_status = 1", $chapter_row->id);
-    while ($example_row = db_fetch_object($example_q))
+    $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = :chapter_id AND approval_status = 1", array(':chapter_id'=> $chapter_row->id));
+    while ($example_row = $example_q->fetchObject())
     {
       $EX_PATH = 'EX' . $example_row->number . '/';
-      $example_files_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE example_id = %d", $example_row->id);
-      $example_dependency_files_q = db_query("SELECT * FROM {textbook_companion_example_dependency} WHERE example_id = %d", $example_row->id);
-      while ($example_files_row = db_fetch_object($example_files_q))
+      $example_files_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE example_id = :example_id", array(':example_id' => $example_row->id));
+      $example_dependency_files_q = db_query("SELECT * FROM {textbook_companion_example_dependency} WHERE example_id = :example_id", array(':example_id' => $example_row->id));
+      while ($example_files_row = $example_files_q->fetchObject())
       {
-        $zip->addFile($root_path . $example_files_row->filepath, $BK_PATH . $APPROVE_PATH . $CH_PATH . $EX_PATH . $example_files_row->filename);
+       $zip->addFile($root_path . $example_files_row->filepath, $BK_PATH . $APPROVE_PATH . $CH_PATH . $EX_PATH . $example_files_row->filename);
       }
       /* dependency files */
-      while ($example_dependency_files_row = db_fetch_object($example_dependency_files_q))
+      while ($example_dependency_files_row = $example_dependency_files_q->fetchObject())
       {
-        $dependency_file_data = db_fetch_object(db_query("SELECT * FROM {textbook_companion_dependency_files} WHERE id = %d LIMIT 1", $example_dependency_files_row->dependency_id));
+        $dependency_file_data_query = db_query("SELECT * FROM {textbook_companion_dependency_files} WHERE id = :id LIMIT 1", array(':id' => $example_dependency_files_row->dependency_id));
+	$dependency_file_data = $dependency_file_data_query->fetchObject();
         if ($dependency_file_data)
           $zip->addFile($root_path . $dependency_file_data->filepath, $BK_PATH . $APPROVE_PATH . $CH_PATH . $EX_PATH . 'DEPENDENCIES/' . $dependency_file_data->filename);
       }
     }
-
     /* unapproved examples */
-    $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = %d AND approval_status = 0", $chapter_row->id);
-    while ($example_row = db_fetch_object($example_q))
+    $example_q = db_query("SELECT * FROM {textbook_companion_example} WHERE chapter_id = :chapter_id AND approval_status = 0",array(':chapter_id' => $chapter_row->id));
+    while ($example_row = $example_q->fetchObject())
     {
       $EX_PATH = 'EX' . $example_row->number . '/';
-      $example_files_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE example_id = %d", $example_row->id);
-      $example_dependency_files_q = db_query("SELECT * FROM {textbook_companion_example_dependency} WHERE example_id = %d", $example_row->id);
-      while ($example_files_row = db_fetch_object($example_files_q))
+      $example_files_q = db_query("SELECT * FROM {textbook_companion_example_files} WHERE example_id = :id",array(':id' => $example_row->id));
+      $example_dependency_files_q = db_query("SELECT * FROM {textbook_companion_example_dependency} WHERE example_id = :id",array(':id' => $example_row->id));
+      while ($example_files_row = $example_files_q->fetchObject())
       {
         $zip->addFile($root_path . $example_files_row->filepath, $BK_PATH . $PENDING_PATH . $CH_PATH . $EX_PATH . $example_files_row->filename);
       }
       /* dependency files */
-      while ($example_dependency_files_row = db_fetch_object($example_dependency_files_q))
+      while ($example_dependency_files_row = $example_dependency_files_q->fetchObject())
       {
-        $dependency_file_data = db_fetch_object(db_query("SELECT * FROM {textbook_companion_dependency_files} WHERE id = %d LIMIT 1", $example_dependency_files_row->dependency_id));
+        $dependency_file_data_query = db_query("SELECT * FROM {textbook_companion_dependency_files} WHERE id = :id LIMIT 1", array(':id' => $example_dependency_files_row->dependency_id));
+        $dependency_file_data = $dependency_file_data_query->fetchObject();
         if ($dependency_file_data)
-          $zip->addFile($root_path . $dependency_file_data->filepath, $BK_PATH . $PENDING_PATH . $CH_PATH . $EX_PATH . 'DEPENDENCIES/' . $dependency_file_data->filename);
-      }
+$zip->addFile($root_path . $dependency_file_data->filepath, $BK_PATH . $PENDING_PATH . $CH_PATH . $EX_PATH . 'DEPENDENCIES/' . $dependency_file_data->filename);
     }
+   }
   }
-
   $zip_file_count = $zip->numFiles;
   $zip->close();
-
   if ($zip_file_count > 0)
   {
     /* download zip file */
@@ -160,7 +221,7 @@ function textbook_companion_download_full_book()
     //header('Expires: 0');
     //header('Pragma: no-cache');
     //ob_end_flush();
-    ob_clean();
+    //ob_clean();
     //flush();
     readfile($zip_filename);
     unlink($zip_filename);
@@ -168,5 +229,5 @@ function textbook_companion_download_full_book()
     drupal_set_message("There are no examples in this book to download", 'error');
     drupal_goto('code_approval/bulk');
   }
-}
 
+}