|
From: <al...@us...> - 2008-08-26 00:54:12
|
Revision: 640
http://sciret.svn.sourceforge.net/sciret/?rev=640&view=rev
Author: alpeb
Date: 2008-08-26 00:54:07 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
fixed old db calls
Modified Paths:
--------------
trunk/models/ArticleGateway.php
trunk/models/FavoriteGateway.php
trunk/models/UserGateway.php
Modified: trunk/models/ArticleGateway.php
===================================================================
--- trunk/models/ArticleGateway.php 2008-08-26 00:49:40 UTC (rev 639)
+++ trunk/models/ArticleGateway.php 2008-08-26 00:54:07 UTC (rev 640)
@@ -87,7 +87,7 @@
break;
case 'withFullName':
$query = 'SELECT SQL_CALC_FOUND_ROWS art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, art.user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, firstname, lastname '
- .'FROM articles art LEFT JOIN users u ON art.user_id = u.user_id '
+ .'FROM articles art LEFT JOIN users u ON art.user_id = u.id'
. $where . " ORDER BY $order $direction";
if ($numRecords != -1) {
$query .= ' LIMIT ' . (int)$offset . ', ' . (int)$numRecords;
@@ -136,7 +136,7 @@
$whereArr[] = 'art.art_id=?';
$where = implode(' AND ', $whereArr);
$query = 'SELECT art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, art.user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT(f.file_id) AS num_files, firstname, lastname '
- .'FROM articles art LEFT JOIN files f on art.art_id = f.art_id LEFT JOIN users u ON art.user_id = u.user_id '
+ .'FROM articles art LEFT JOIN files f on art.art_id = f.art_id LEFT JOIN users u ON art.user_id = u.id '
."WHERE $where "
.'GROUP BY art.art_id';
$result = DB::getInstance()->query($query, $searchQuery);
@@ -153,13 +153,13 @@
$where = implode(' AND ', $whereArr);
$query = 'SELECT SQL_CALC_FOUND_ROWS MATCH(title, content, url) AGAINST(?) AS score, art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, art.user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT(f.file_id) AS num_files, firstname, lastname '
- .'FROM articles art LEFT JOIN files f on art.art_id = f.art_id LEFT JOIN users u ON art.user_id = u.user_id '
+ .'FROM articles art LEFT JOIN files f on art.art_id = f.art_id LEFT JOIN users u ON art.user_id = u.id '
."WHERE $where "
.'GROUP BY art.art_id';
if ($numRecords != -1) {
$query .= ' LIMIT ' . (int)$offset . ', ' . (int)$numRecords;
}
- $result = DB::getInstance()->query($query, $searchQuery, $searchQuery);
+ $result = DB::getInstance()->query($query, array($searchQuery, $searchQuery));
}
if ($numRecords != -1) {
Modified: trunk/models/FavoriteGateway.php
===================================================================
--- trunk/models/FavoriteGateway.php 2008-08-26 00:49:40 UTC (rev 639)
+++ trunk/models/FavoriteGateway.php 2008-08-26 00:54:07 UTC (rev 640)
@@ -43,31 +43,31 @@
function deleteArticleFavorite($artId, $userId) {
$query = 'DELETE FROM favorites WHERE art_id = ? AND user_id = ?';
- $result = DB::getInstance()->query($query, $artId, $userId);
+ $result = DB::getInstance()->query($query, array($artId, $userId));
}
function deleteSearchResultFavorite($queryStr, $userId) {
$query = 'DELETE FROM favorites WHERE search_str = ? AND user_id = ?';
- $result = DB::getInstance()->query($query, $queryStr, $userId);
+ $result = DB::getInstance()->query($query, array($queryStr, $userId));
}
function deleteLocationFavorite($catId, $userId) {
$query = 'DELETE FROM favorites WHERE cat_id = ? AND user_id = ?';
- $result = DB::getInstance()->query($query, $catId, $userId);
+ $result = DB::getInstance()->query($query, array($catId, $userId));
}
function isSearchResultFavorite($queryStr, $userId) {
$query = 'SELECT favorite_id FROM favorites WHERE search_str = ? AND user_id = ?';
- $result = DB::getInstance()->query($query, $queryStr, $userId);
+ $result = DB::getInstance()->query($query, array($queryStr, $userId));
- return ($result->getNumRows() > 0);
+ return ($result->rowCount() > 0);
}
function isLocationFavorite($catId, $userId) {
$query = 'SELECT favorite_id FROM favorites WHERE cat_id = ? AND user_id = ?';
- $result = DB::getInstance()->query($query, $catId, $userId);
+ $result = DB::getInstance()->query($query, array($catId, $userId));
- return ($result->getNumRows() > 0);
+ return ($result->rowCount() > 0);
}
}
Modified: trunk/models/UserGateway.php
===================================================================
--- trunk/models/UserGateway.php 2008-08-26 00:49:40 UTC (rev 639)
+++ trunk/models/UserGateway.php 2008-08-26 00:54:07 UTC (rev 640)
@@ -41,7 +41,7 @@
function getUsersList() {
$query = 'SELECT id, firstname, lastname, username, email, admin FROM users';
- $result = $this->db->query($query);
+ $result = DB::getInstance()->query($query);
$users = array();
while ($row = $result->fetch()) {
$user = new User;
@@ -59,10 +59,10 @@
function deleteUser($userId) {
$query = 'DELETE FROM users WHERE id=?';
- $this->db->query($query, $userId);
+ DB::getInstance()->query($query, $userId);
$query = 'UPDATE articles SET user_id = 1 WHERE user_id=?';
- $this->db->query($query, $userId);
+ DB::getInstance()->query($query, $userId);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|