From: <var...@us...> - 2009-03-26 11:02:31
|
Revision: 6715 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6715&view=rev Author: vargenau Date: 2009-03-26 11:02:27 +0000 (Thu, 26 Mar 2009) Log Message: ----------- Fix broken char Modified Paths: -------------- trunk/lib/wikilens/RatingsDb.php Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2009-03-26 10:58:05 UTC (rev 6714) +++ trunk/lib/wikilens/RatingsDb.php 2009-03-26 11:02:27 UTC (rev 6715) @@ -24,7 +24,7 @@ */ // For other than SQL backends. dba + adodb SQL ratings are allowed but deprecated. -// We will probabl\xF6y drop this hack. +// We will probably drop this hack. if (!defined('RATING_STORAGE')) // for DATABASE_TYPE=dba and forced RATING_STORAGE=SQL we must use ADODB, // but this is problematic. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-11-15 13:54:42
|
Revision: 8476 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8476&view=rev Author: vargenau Date: 2012-11-15 13:54:31 +0000 (Thu, 15 Nov 2012) Log Message: ----------- Simpler SQL query Modified Paths: -------------- trunk/lib/wikilens/RatingsDb.php Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2012-11-15 13:38:31 UTC (rev 8475) +++ trunk/lib/wikilens/RatingsDb.php 2012-11-15 13:54:31 UTC (rev 8476) @@ -383,12 +383,8 @@ if (isset($pagename)) $where .= " AND"; $where .= " dimension=$dimension"; } - //$dbh = &$this->_dbi; extract($dbi->_table_names); - $query = "SELECT AVG(ratingvalue) as avg" - . " FROM $rating_tbl r, $page_tbl p " - . $where - . " GROUP BY raterpage"; + $query = "SELECT AVG(ratingvalue) as avg FROM $rating_tbl r, $page_tbl p " . $where . " GROUP BY raterpage"; $result = $dbi->_dbh->query($query); $iter = new $this->iter_class($this, $result); $row = $iter->next(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-11-15 14:07:24
|
Revision: 8477 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8477&view=rev Author: vargenau Date: 2012-11-15 14:07:14 +0000 (Thu, 15 Nov 2012) Log Message: ----------- Check for FUSIONFORGE Modified Paths: -------------- trunk/lib/wikilens/RatingsDb.php Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2012-11-15 13:54:31 UTC (rev 8476) +++ trunk/lib/wikilens/RatingsDb.php 2012-11-15 14:07:14 UTC (rev 8477) @@ -376,15 +376,24 @@ $where = "WHERE"; } if (isset($pagename)) { - $raterid = $this->_sqlbackend->_get_pageid($pagename, true); - $where .= " raterpage=$raterid"; + if (defined('FUSIONFORGE') and FUSIONFORGE) { + $rateeid = $this->_sqlbackend->_get_pageid($pagename, true); + $where .= " rateepage=$rateeid"; + } else { + $raterid = $this->_sqlbackend->_get_pageid($pagename, true); + $where .= " raterpage=$raterid"; + } } if (isset($dimension)) { if (isset($pagename)) $where .= " AND"; $where .= " dimension=$dimension"; } extract($dbi->_table_names); - $query = "SELECT AVG(ratingvalue) as avg FROM $rating_tbl r, $page_tbl p " . $where . " GROUP BY raterpage"; + if (defined('FUSIONFORGE') and FUSIONFORGE) { + $query = "SELECT AVG(ratingvalue) as avg FROM $rating_tbl " . $where; + } else { + $query = "SELECT AVG(ratingvalue) as avg FROM $rating_tbl r, $page_tbl p " . $where . " GROUP BY raterpage"; + } $result = $dbi->_dbh->query($query); $iter = new $this->iter_class($this, $result); $row = $iter->next(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-12-27 17:56:15
|
Revision: 8692 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8692&view=rev Author: vargenau Date: 2012-12-27 17:56:07 +0000 (Thu, 27 Dec 2012) Log Message: ----------- Remove commented code Modified Paths: -------------- trunk/lib/wikilens/RatingsDb.php Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2012-12-27 11:05:49 UTC (rev 8691) +++ trunk/lib/wikilens/RatingsDb.php 2012-12-27 17:56:07 UTC (rev 8692) @@ -641,130 +641,6 @@ } -/* -class RatingsDB_backend_PearDB -extends WikiDB_backend_PearDB { - function get_rating($dimension=null, $rater=null, $ratee=null, - $orderby=null, $pageinfo = "ratee") { - $result = $this->_get_rating_result( - $dimension, $rater, $ratee, $orderby, $pageinfo); - return new WikiDB_backend_PearDB_generic_iter($this, $result); - } - - function get_users_rated($dimension=null, $orderby=null) { - $result = $this->_get_users_rated_result( - $dimension, $orderby); - return new WikiDB_backend_PearDB_generic_iter($this, $result); - } - - function get_rating_page($dimension=null, $rater=null, $ratee=null, - $orderby=null, $pageinfo = "ratee") { - $result = $this->_get_rating_result( - $dimension, $rater, $ratee, $orderby, $pageinfo); - return new WikiDB_backend_PearDB_iter($this, $result); - } - - function _get_rating_result($dimension=null, $rater=null, $ratee=null, - $orderby=null, $pageinfo = "ratee") { - // pageinfo must be 'rater' or 'ratee' - if (($pageinfo != "ratee") && ($pageinfo != "rater")) - return; - - $dbh = &$this->_dbh; - extract($this->_table_names); - - $where = "WHERE r." . $pageinfo . "page = p.id"; - if (isset($dimension)) { - $where .= " AND dimension=$dimension"; - } - if (isset($rater)) { - $raterid = $this->_get_pageid($rater, true); - $where .= " AND raterpage=$raterid"; - } - if (isset($ratee)) { - if(is_array($ratee)){ - $where .= " AND ("; - for($i = 0; $i < count($ratee); $i++){ - $rateeid = $this->_get_pageid($ratee[$i], true); - $where .= "rateepage=$rateeid"; - if($i != (count($ratee) - 1)){ - $where .= " OR "; - } - } - $where .= ")"; - } else { - $rateeid = $this->_get_pageid($ratee, true); - $where .= " AND rateepage=$rateeid"; - } - } - - $orderbyStr = ""; - if (isset($orderby)) { - $orderbyStr = " ORDER BY " . $orderby; - } - - $query = "SELECT *" - . " FROM $rating_tbl r, $page_tbl p " - . $where - . $orderbyStr; - - $result = $dbh->query($query); - - return $result; - } - - function _get_users_rated_result($dimension=null, $orderby=null) { - $dbh = &$this->_dbh; - extract($this->_table_names); - - $where = "WHERE p.id=r.raterpage"; - if (isset($dimension)) { - $where .= " AND dimension=$dimension"; - } - $orderbyStr = ""; - if (isset($orderby)) { - $orderbyStr = " ORDER BY " . $orderby; - } - - $query = "SELECT DISTINCT p.pagename" - . " FROM $rating_tbl r, $page_tbl p " - . $where - . $orderbyStr; - - $result = $dbh->query($query); - - return $result; - } - function delete_rating($rater, $ratee, $dimension) { - $dbh = &$this->_dbh; - extract($this->_table_names); - - $this->lock(); - $raterid = $this->_get_pageid($rater, true); - $rateeid = $this->_get_pageid($ratee, true); - - $dbh->query("DELETE FROM $rating_tbl WHERE raterpage=$raterid and rateepage=$rateeid and dimension=$dimension"); - $this->unlock(); - return true; - } - - function rate($rater, $ratee, $rateeversion, $dimension, $rating, $isPrivate = 'no') { - $dbh = &$this->_dbh; - extract($this->_table_names); - - $this->lock(); - $raterid = $this->_get_pageid($rater, true); - $rateeid = $this->_get_pageid($ratee, true); - - $dbh->query("DELETE FROM $rating_tbl WHERE raterpage=$raterid and rateepage=$rateeid and dimension=$dimension and isPrivate='$isPrivate'"); - // NOTE: Leave tstamp off the insert, and MySQL automatically updates it - $dbh->query("INSERT INTO $rating_tbl (dimension, raterpage, rateepage, ratingvalue, rateeversion, isPrivate) VALUES ($dimension, $raterid, $rateeid, $rating, $rateeversion, '$isPrivate')"); - $this->unlock(); - return true; - } -} -*/ - // Local Variables: // mode: php // tab-width: 8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-06 17:09:31
|
Revision: 9201 http://sourceforge.net/p/phpwiki/code/9201 Author: vargenau Date: 2014-10-06 17:09:23 +0000 (Mon, 06 Oct 2014) Log Message: ----------- Whitespace only Modified Paths: -------------- trunk/lib/wikilens/RatingsDb.php Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2014-10-06 17:08:10 UTC (rev 9200) +++ trunk/lib/wikilens/RatingsDb.php 2014-10-06 17:09:23 UTC (rev 9201) @@ -448,7 +448,6 @@ * * @return DB iterator with results */ - function sql_get_rating($dimension = null, $rater = null, $ratee = null, $orderby = null, $pageinfo = "ratee") { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-07-10 14:34:17
|
Revision: 9711 http://sourceforge.net/p/phpwiki/code/9711 Author: vargenau Date: 2015-07-10 14:34:15 +0000 (Fri, 10 Jul 2015) Log Message: ----------- No return argument Modified Paths: -------------- trunk/lib/wikilens/RatingsDb.php Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2015-07-10 14:20:58 UTC (rev 9710) +++ trunk/lib/wikilens/RatingsDb.php 2015-07-10 14:34:15 UTC (rev 9711) @@ -625,7 +625,7 @@ function metadata_set_rating($userid, $pagename, $dimension, $rating = -1) { - if (!$pagename) return false; + if (!$pagename) return; $page = $this->_dbi->getPage($pagename); $data = $page->get('rating'); if ($rating == -1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-30 16:30:58
|
Revision: 10411 http://sourceforge.net/p/phpwiki/code/10411 Author: vargenau Date: 2021-07-30 16:30:56 +0000 (Fri, 30 Jul 2021) Log Message: ----------- lib/wikilens/RatingsDb.php: check row exists Modified Paths: -------------- trunk/lib/wikilens/RatingsDb.php Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2021-07-30 16:28:34 UTC (rev 10410) +++ trunk/lib/wikilens/RatingsDb.php 2021-07-30 16:30:56 UTC (rev 10411) @@ -430,9 +430,10 @@ $result = $dbi->_dbh->query($query); $iter = new $this->iter_class($this, $result); $row = $iter->next(); - return $row['avg']; + return is_array($row) ? $row['avg'] : 0; } else { - if (!$pagename) return 0; + if (!$pagename) + return 0; $page = $this->_dbi->getPage($pagename); $data = $page->get('rating'); if (!empty($data[$dimension])) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |