diff options
| -rw-r--r-- | FisheyeImage.php | 8 | ||||
| -rw-r--r-- | admin/upgrade_inc.php | 2 | ||||
| -rwxr-xr-x | thumbnailer.php | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/FisheyeImage.php b/FisheyeImage.php index 58275b1..c83b5ad 100644 --- a/FisheyeImage.php +++ b/FisheyeImage.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.47 2007/06/14 05:27:48 lsces Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeImage.php,v 1.48 2007/06/14 12:41:52 lsces Exp $ * @package fisheye */ @@ -408,11 +408,11 @@ class FisheyeImage extends FisheyeBase { $ret = FALSE; // LibertyAttachable will take care of thumbnail generation of the offline thumbnailer is not active if( $gBitSystem->isFeatureActive( 'liberty_offline_thumbnailer' ) ) { - $query = "DELETE FROM `".BIT_DB_PREFIX."liberty_thumbnail_queue` + $query = "DELETE FROM `".BIT_DB_PREFIX."liberty_process_queue` WHERE `content_id`=?"; $this->mDb->query( $query, array( $this->mContentId ) ); - $query = "INSERT INTO `".BIT_DB_PREFIX."liberty_thumbnail_queue` - (`content_id`, `queue_date`, `resize_original`) VALUES (?,?,?)"; + $query = "INSERT INTO `".BIT_DB_PREFIX."liberty_process_queue` + (`content_id`, `queue_date`, `log_message`) VALUES (?,?,?)"; $this->mDb->query( $query, array( $this->mContentId, $gBitSystem->getUTCTime(), $pResizeOriginal ) ); } else { $ret = $this->renderThumbnails(); diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index 1709d30..38dc6c8 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -12,7 +12,7 @@ array( 'DATADICT' => array( 'tiki_fisheye_gallery' => 'fisheye_gallery', 'tiki_fisheye_gallery_image_map' => 'fisheye_gallery_image_map', 'tiki_fisheye_image' => 'fisheye_image', - 'tiki_thumbnail_queue' => 'liberty_thumbnail_queue', + 'tiki_thumbnail_queue' => 'liberty_process_queue', )), array( 'RENAMESEQUENCE' => array( "tiki_fisheye_gallery_id_seq" => "fisheye_gallery_id_seq", diff --git a/thumbnailer.php b/thumbnailer.php index fcf3f55..5023e01 100755 --- a/thumbnailer.php +++ b/thumbnailer.php @@ -9,7 +9,7 @@ * suggested crontab entry runs the thumbnailer every minute: * * * * * * apache php -q /path/to/bitweaver/fisheye/thumbnailer.php 20 >> /var/log/httpd/thumbnail_log * - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/thumbnailer.php,v 1.9 2007/04/23 09:36:31 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/thumbnailer.php,v 1.10 2007/06/14 12:41:18 lsces Exp $ * @package fisheye * @subpackage functions */ @@ -45,16 +45,16 @@ $gBitSystem->mDb->StartTrans(); - $sql = "SELECT tq.content_id AS hash_key, tq.* - FROM `".BIT_DB_PREFIX."liberty_thumbnail_queue` tq - WHERE tq.begin_date IS NULL - ORDER BY tq.queue_date"; + $sql = "SELECT pq.content_id AS hash_key, tq.* + FROM `".BIT_DB_PREFIX."liberty_process_queue` pq + WHERE pq.begin_date IS NULL + ORDER BY pq.queue_date"; $rs = $gBitSystem->mDb->query( $sql, NULL, $thumbCount ); $processContent = array(); while( !$rs->EOF ) { $processContent[$rs->fields['content_id']] = $rs->fields; - $sql2 = "UPDATE `".BIT_DB_PREFIX."liberty_thumbnail_queue` SET `begin_date`=? WHERE `content_id`=?"; + $sql2 = "UPDATE `".BIT_DB_PREFIX."liberty_process_queue` SET `begin_date`=? WHERE `content_id`=?"; $rs2 = $gBitSystem->mDb->query( $sql2, array( date( 'U' ), $rs->fields['content_id'] ) ); $rs->MoveNext(); } @@ -71,7 +71,7 @@ } if( $image->renderThumbnails() ) { $log[$contentId]['message'] = 'SUCCESS: Thumbnails created'; - $sql3 = "UPDATE `".BIT_DB_PREFIX."liberty_thumbnail_queue` SET `begin_date`=?, `end_date`=? WHERE `content_id`=?"; + $sql3 = "UPDATE `".BIT_DB_PREFIX."liberty_process_queue` SET `begin_date`=?, `end_date`=? WHERE `content_id`=?"; $rs3 = $gBitSystem->mDb->query( $sql3, array( $begin, $gBitSystem->getUTCTime(), $contentId ) ); } else { $log[$contentId]['message'] = ' ERROR: '.$image->mErrors['thumbnail']; |