Index: db.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/op_video/db.inc,v retrieving revision 1.1 diff -u -F^f -u -F^f -r1.1 db.inc --- db.inc 18 Aug 2007 15:20:28 -0000 1.1 +++ db.inc 1 Feb 2008 07:20:21 -0000 @@ -25,19 +25,21 @@ function _op_video_db_insert($table, $fi if(is_array($fields)) { foreach($fields as $field => $format) { if(isset($data[$field])) { - $sql_params[] = $field . ' = ' . $format; + $sql_fields[] = $field; + $sql_params[] = $format; $sql_values[] = $data[$field]; } } } if(count($sql_params)) { - $sql_params = 'SET ' . implode(",", $sql_params); + $sql_fields = implode(", ", $sql_fields); + $sql_params = implode(", ", $sql_params); db_query(" INSERT INTO {{$table}} - $sql_params - ", + ($sql_fields) + VALUES ($sql_params)", $sql_values ); } Index: op_video.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/op_video/op_video.install,v retrieving revision 1.1.4.2 diff -u -F^f -u -F^f -r1.1.4.2 op_video.install --- op_video.install 26 Jan 2008 15:09:38 -0000 1.1.4.2 +++ op_video.install 1 Feb 2008 07:20:21 -0000 @@ -105,7 +105,98 @@ function op_video_install() { break; case 'pgsql': - return; + db_query(" + CREATE TABLE {op_videos} ( + video_id serial, + duration int NOT NULL DEFAULT '0', + secret char(32) NOT NULL DEFAULT '', + source_file_id int NOT NULL DEFAULT '0', + flv_file_id int DEFAULT NULL, + raw_image_1_file_id int DEFAULT NULL, + raw_image_2_file_id int DEFAULT NULL, + splash_file_id int DEFAULT NULL, + thumb_file_id int DEFAULT NULL, + current_params_id int NOT NULL DEFAULT '0', + dirty_params_id int NOT NULL DEFAULT '0', + status char(32) NOT NULL default 'dirty', + error char(32) NOT NULL default 'none', + upload_failed int NOT NULL DEFAULT '0', + uploaded int NOT NULL DEFAULT '0', + transcoder_version int NOT NULL DEFAULT '0', + views int NOT NULL DEFAULT '0', + views_completed int NOT NULL DEFAULT '0', + downloads int NOT NULL DEFAULT '0', + PRIMARY KEY (video_id), + UNIQUE (flv_file_id), + UNIQUE (raw_image_1_file_id), + UNIQUE (raw_image_2_file_id), + UNIQUE (splash_file_id), + UNIQUE (thumb_file_id) + ) + "); + + db_query("CREATE INDEX {op_videos}_status_idx ON {op_videos} (status)"); + db_query("CREATE INDEX {op_videos}_transcoder_version_idx ON {op_videos} (transcoder_version)"); + db_query("CREATE INDEX {op_videos}_views_idx ON {op_videos} (views)"); + db_query("CREATE INDEX {op_videos}_downloads_idx ON {op_videos} (downloads)"); + db_query("CREATE INDEX {op_videos}_error_idx ON {op_videos} (error)"); + db_query("CREATE INDEX {op_videos}_secret_idx ON {op_videos} (secret)"); + db_query("CREATE INDEX {op_videos}_views_completed_idx ON {op_videos} (views_completed)"); + db_query("CREATE INDEX {op_videos}_duration_idx ON {op_videos} (duration)"); + + db_query(" + CREATE TABLE {op_video_files} ( + file_id serial, + filename varchar(255) NOT NULL DEFAULT '', + filepath varchar(255) NOT NULL DEFAULT '', + filemime varchar(255) NOT NULL DEFAULT '', + filesize int NOT NULL DEFAULT '0', + keepme int NOT NULL DEFAULT '0', + dirty int NOT NULL DEFAULT '0', + obtained int NOT NULL DEFAULT '0', + deleted int NOT NULL DEFAULT '0', + PRIMARY KEY (file_id) + ) + "); + + db_query("CREATE INDEX {op_video_files}_obtained_idx ON {op_video_files} (obtained)"); + db_query("CREATE INDEX {op_video_files}_filesize_idx ON {op_video_files} (filesize)"); + db_query("CREATE INDEX {op_video_files}_filepath_idx ON {op_video_files} (filepath)"); + db_query("CREATE INDEX {op_video_files}_deleted_idx ON {op_video_files} (deleted)"); + + db_query(" + CREATE TABLE {op_video_params} ( + params_id serial, + width int NOT NULL DEFAULT '0', + frame_rate int NOT NULL DEFAULT '0', + key_interval NUMERIC(3,1) NOT NULL DEFAULT '0.0', + video_bitrate int NOT NULL DEFAULT '0', + audio_channels char(5) NOT NULL DEFAULT '0', + audio_sample_rate char(5) NOT NULL DEFAULT '11025', + audio_bitrate int NOT NULL DEFAULT '0', + max_duration int NOT NULL DEFAULT '0', + keep_source_file int NOT NULL DEFAULT '0', + PRIMARY KEY (params_id) + ) + "); + + db_query(" + CREATE TABLE {op_video_stats} ( + type char(32) NOT NULL DEFAULT '', + video_id int NOT NULL DEFAULT '0', + uid int NOT NULL DEFAULT '0', + sid char(32) NOT NULL DEFAULT '', + ip_addr int NOT NULL DEFAULT '0', + timestamp int NOT NULL DEFAULT '0' + ) + "); + + db_query("CREATE INDEX {op_video_stats}_video_id_idx ON {op_video_stats} (video_id)"); + db_query("CREATE INDEX {op_video_stats}_timestamp_idx ON {op_video_stats} (timestamp)"); + db_query("CREATE INDEX {op_video_stats}_uid_idx ON {op_video_stats} (uid)"); + db_query("CREATE INDEX {op_video_stats}_type_idx ON {op_video_stats} (type)"); + + break; } } Index: op_video.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/op_video/op_video.module,v retrieving revision 1.1 diff -u -F^f -u -F^f -r1.1 op_video.module --- op_video.module 18 Aug 2007 15:20:28 -0000 1.1 +++ op_video.module 1 Feb 2008 07:20:21 -0000 @@ -133,10 +133,8 @@ function _op_video_create_video($source_ db_query(" INSERT INTO {op_videos} - SET secret = '%s', - source_file_id = %d, - dirty_params_id = %d - ", + (secret, source_file_id, dirty_params_id) + VALUES ('%s', %d, %d)", md5(user_password()), $source_file_id, $dirty_params_id @@ -409,27 +407,23 @@ function _op_video_log($type, $video_id) db_query(" INSERT INTO {op_video_stats} - SET type = '$type', - video_id = $video_id, - uid = $user->uid, - sid = '$sid', - ip_addr = INET_ATON('$ip_addr'), - timestamp = $time - "); -} + (type, video_id, uid, sid, ip_addr, timestamp) + VALUES ('%s', %d, %d, '%s', %d, %d)", + $type, $video_id, $user->uid, $sid, ip2long($ip_addr), $time); + } function _op_video_callback() { switch($_POST['state']) { - + case 'start': $type = 'view'; break; - + case 'stop': $type = 'view completed'; break; - + default: return; } Index: op_video_node.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/op_video/Attic/op_video_node.install,v retrieving revision 1.1.4.1 diff -u -F^f -u -F^f -r1.1.4.1 op_video_node.install --- op_video_node.install 26 Jan 2008 15:09:38 -0000 1.1.4.1 +++ op_video_node.install 1 Feb 2008 07:20:21 -0000 @@ -26,7 +26,19 @@ function op_video_node_install() { break; case 'pgsql': - return; + + db_query(" + CREATE TABLE {op_video_node_revisions} ( + nid int NOT NULL DEFAULT '0', + vid int NOT NULL DEFAULT '0', + video_id int NOT NULL DEFAULT '0', + PRIMARY KEY (vid), + UNIQUE (video_id) + ) + "); + + db_query("CREATE INDEX {op_video_node_revisions}_nid_idx ON {op_video_node_revisions} (nid)"); + break; } _op_video_node_save_default_transcoding_params(); Index: op_video_node.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/op_video/Attic/op_video_node.module,v retrieving revision 1.2.2.1 diff -u -F^f -u -F^f -r1.2.2.1 op_video_node.module --- op_video_node.module 18 Jan 2008 05:12:51 -0000 1.2.2.1 +++ op_video_node.module 1 Feb 2008 07:20:21 -0000 @@ -452,16 +452,14 @@ function op_video_insert($node) { db_query(" INSERT INTO {op_video_node_revisions} - SET nid = %d, - vid = %d, - video_id = %d - ", + (nid, vid, video_id) + VALUES (%d, %d, %d)", $node->nid, $node->vid, $video_id ); - if(variable_get('op_video_node_auto_publish', OP_VIDEO_NODE_DEFAULT_AUTO_PUBLISH) && + if(variable_get('op_video_node_auto_publish', OP_VIDEO_NODE_DEFAULT_AUTO_PUBLISH) && !user_access('administer nodes')) { drupal_set_message('Your video will appear upon successful processing.'); }