X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fmodels%2Fvideos_model.php;h=0250038b105272064cc2ecd4ae4ef2e28b0f4740;hb=355535fa933c0fc2c1d63f0d4df3b1fc6e60d05c;hp=fccb7a043e686324ee2f065eb83e14d22a0c4e3c;hpb=69c30ca56fdc6a4eff236902040cc04ec6eaccf2;p=living-lab-site.git
diff --git a/application/models/videos_model.php b/application/models/videos_model.php
index fccb7a0..0250038 100644
--- a/application/models/videos_model.php
+++ b/application/models/videos_model.php
@@ -11,6 +11,8 @@ class Videos_model extends CI_Model {
public function __construct()
{
+ parent::__construct();
+
if ($this->db === NULL)
{
$this->load->library('singleton_db');
@@ -19,10 +21,13 @@ class Videos_model extends CI_Model {
}
/**
- * Retrieves information about a set of videos which are going to be
- * displayed in the catalog.
+ * Retrieves a set of videos information which can be used for displaying
+ * that videos as a list with few details.
*
- * @param int $category_id DB category ID
+ * @param int $category_id DB category ID; pass NULL for all
+ * categories
+ * @param mixed $user an user_id (as int) or an username
+ * (as string); pass NULL for all users
* @param int $offset
* @param int $count
* @param string $ordering control videos ording by these
@@ -39,11 +44,12 @@ class Videos_model extends CI_Model {
*
id, name, title, duration, thumbs_count, default_thumb, views => from DB
* shorted_title => ellipsized title
* video_url => P2P-Tube video URl
- * TODO: user_id, user_name
+ * user_id, user_name
* thumbs => thumbnail images' URLs
*
*/
- public function get_videos_summary($category_id, $offset, $count, $ordering = 'hottest')
+ public function get_videos_summary($category_id, $user, $offset, $count,
+ $ordering = 'hottest')
{
$this->load->helper('text');
@@ -64,19 +70,39 @@ class Videos_model extends CI_Model {
$order_statement = "";
}
+ // Category filtering
+ if ($category_id === NULL)
+ $cond_category = "1";
+ else
+ {
+ $category_id = intval($category_id);
+ $cond_category = "category_id = $category_id";
+ }
+
+ // User filtering
+ if ($user === NULL)
+ $cond_user = "1";
+ else
+ {
+ if (is_int($user))
+ $cond_user = "v.user_id = $user";
+ else if (is_string($user))
+ $cond_user = "u.username = '$user'";
+ }
+
$query = $this->db->query(
- "SELECT id, name, title, duration, user_id, views, thumbs_count,
- default_thumb, (views + likes - dislikes) AS score
- FROM `videos`
- WHERE category_id = ?
+ "SELECT v.id, name, title, duration, user_id, u.username, views,
+ thumbs_count, default_thumb,
+ (views + likes - dislikes) AS score
+ FROM `videos` v, `users` u
+ WHERE v.user_id = u.id AND $cond_category AND $cond_user
$order_statement
- LIMIT ?, ?",
- array(intval($category_id), $offset, $count));
+ LIMIT $offset, $count");
if ($query->num_rows() > 0)
$videos = $query->result_array();
else
- return NULL;
+ return array();
foreach ($videos as & $video)
{
@@ -91,21 +117,41 @@ class Videos_model extends CI_Model {
// Ellipsized title
//$video['shorted_title'] = ellipsize($video['title'], 45, 0.75);
$video['shorted_title'] = character_limiter($video['title'], 50);
-
- // TODO: user information
- $video['user_name'] = 'TODO';
}
return $videos;
}
- public function get_videos_count($category_id)
+ /**
+ * Returns the number of videos from database from a specific category or
+ * user.
+ * NULL parameters count videos from all categories and / or all users.
+ *
+ * @param int $category_id
+ * @param mixed $user an user_id (as int) or an username (as string)
+ * @return int number of videos or NULL if an error occured
+ */
+ public function get_videos_count($category_id = NULL, $user = NULL)
{
+ if ($category_id === NULL)
+ $cond_category = "1";
+ else
+ $cond_category = "category_id = $category_id";
+
+ if ($user === NULL)
+ $cond_user = "1";
+ else
+ {
+ if (is_int($user))
+ $cond_user = "v.user_id = $user";
+ else if(is_string($user))
+ $cond_user = "u.username = '$user'";
+ }
+
$query = $this->db->query(
- 'SELECT COUNT(*) count
- FROM `videos`
- WHERE category_id = ?',
- $category_id);
+ "SELECT COUNT(*) count
+ FROM `videos` v, `users` u
+ WHERE v.user_id = u.id AND $cond_category AND $cond_user");
if ($query->num_rows() > 0)
return $query->row()->count;
@@ -133,7 +179,7 @@ class Videos_model extends CI_Model {
* video asset having keys: "src", "res", "par" and "ext". Value of key
* "src" is the video torrent formated as
* {name}_{format}.{video_ext}.{default_torrent_ext}
- * user_name => TODO: user name from `users` table
+ * username => user name from `users` table
* category_title => a human-friendly category name
* tags => associative list of "tag => score"
* date => date and time when the video was created
@@ -144,9 +190,9 @@ class Videos_model extends CI_Model {
{
$this->load->helper('video');
- $query = $this->db->query('SELECT *
- FROM `videos`
- WHERE id = ?', $id);
+ $query = $this->db->query("SELECT v.*, u.username
+ FROM `videos` v, `users` u
+ WHERE v.user_id = u.id AND v.id = $id");
$video = array();
if ($query->num_rows() > 0)
@@ -193,9 +239,6 @@ class Videos_model extends CI_Model {
// Thumbnails
$video['thumbs'] = $this->get_thumbs($video['name'], $video['thumbs_count']);
- // TODO: user information
- $video['user_name'] = 'TODO';
-
return $video;
}
@@ -239,32 +282,50 @@ class Videos_model extends CI_Model {
public function search_videos($search_query, $offset = 0, $count = 0,
$category_id = NULL)
{
- // very short queries
- if (strlen($search_query) < 4)
+ $search_query = trim($search_query);
+ $search_query = str_replace("'", " ", $search_query);
+
+ // Search word fragments.
+ // sfc = search fragment condition
+ $sfc = "( ";
+ // sfr = serach fragment relevation
+ $sfr = "( ";
+ $sep = ' +-*<>()~"';
+ $fragm = strtok($search_query, $sep);
+ while ($fragm !== FALSE)
{
- $search_cond = "(title LIKE '%$search_query%'
- OR description LIKE '%$search_query%'
- OR tags LIKE '%$search_query%')";
- $relevance = "( 0.5 * (title LIKE '%git%')
- + 0.2 * (description LIKE '%git%')
- + 0.3 * (tags LIKE '%git%') ) AS relevance";
+ $sfc .= "(title LIKE '%$fragm%'
+ OR description LIKE '%$fragm%'
+ OR tags LIKE '%$fragm%') OR ";
+
+ // Frament relevations are half of boolean relevations such
+ // that they will appear at the end of the results.
+ $sfr .= "0.25 * (title LIKE '%$fragm%')
+ + 0.1 * (description LIKE '%$fragm%')
+ + 0.15 * (tags LIKE '%$fragm%') + ";
+
+ $fragm = strtok($sep);
}
- // natural language mode
- else if (! $this->is_advanced_search_query($search_query))
+ $sfc = substr($sfc, 0, -4) . " )";
+ $sfr = substr($sfr, 0, -3) . " )";
+
+ if (! $this->is_advanced_search_query($search_query))
{
$search_cond = "MATCH (title, description, tags)
- AGAINST ('$search_query')";
- $relevance = "$search_cond AS relevance";
+ AGAINST ('$search_query') OR $sfc";
+ $relevance = "( MATCH (title, description, tags)
+ AGAINST ('$search_query') + $sfr ) AS relevance";
}
// boolean mode
else
{
$against = "AGAINST ('$search_query' IN BOOLEAN MODE)";
- $search_cond = "MATCH (title, description, tags)
- $against";
- $relevance = "( (0.5 * (MATCH(title) $against))
- + (0.3 * (MATCH(tags) $against))
- + (0.2 * (MATCH(description) $against)) ) AS relevance";
+ $search_cond = "( MATCH (title, description, tags)
+ $against) OR $sfc";
+ $relevance = "( 0.5 * (MATCH(title) $against)
+ + 0.3 * (MATCH(tags) $against)
+ + 0.2 * (MATCH(description) $against)
+ + $sfr) AS relevance";
}
if ($count === 0)
@@ -289,13 +350,12 @@ class Videos_model extends CI_Model {
else
$category_cond = "";
- $search_query = trim($search_query);
-
$str_query = "SELECT $selected_columns
FROM `videos`
- WHERE $category_cond $search_cond
+ WHERE $category_cond ( $search_cond )
$order
$limit";
+// echo "$str_query
";
$query = $this->db->query($str_query);
if ($query->num_rows() > 0)
@@ -347,6 +407,22 @@ class Videos_model extends CI_Model {
return $search_query;
}
+ public function encode_search_query($search_query)
+ {
+ $search_query = str_replace('*', '_AST_', $search_query);
+ $search_query = str_replace('+', '_AND_', $search_query);
+ $search_query = str_replace('>', '_GT_', $search_query);
+ $search_query = str_replace('<', '_LT_', $search_query);
+ $search_query = str_replace('(', '_PO_', $search_query);
+ $search_query = str_replace(')', '_PC_', $search_query);
+ $search_query = str_replace('~', '_LOW_', $search_query);
+ $search_query = str_replace('"', '_QUO_', $search_query);
+
+ $search_query = urlencode($search_query);
+
+ return $search_query;
+ }
+
/**
* Return TRUE if it contains any special caracter from an advanced search
* query.