Menu
▾
▴
[phpwiki-checkins] CVS: phpwiki/lib mysql.php,1.10.2.7,1.10.2.8
|
From: Reini U. <ru...@us...> - 2005-07-23 11:15:57
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4395/lib Modified Files: Tag: release-1_2-branch mysql.php Log Message: rel1.2.8: upcase statements, mysql_pconnect => mysql_connect Index: mysql.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/Attic/mysql.php,v retrieving revision 1.10.2.7 retrieving revision 1.10.2.8 diff -u -2 -b -p -d -r1.10.2.7 -r1.10.2.8 --- mysql.php 7 Jan 2005 14:23:05 -0000 1.10.2.7 +++ mysql.php 23 Jul 2005 11:15:48 -0000 1.10.2.8 @@ -35,7 +35,9 @@ global $mysql_server, $mysql_user, $mysql_pwd, $mysql_db; - if (!($dbc = mysql_pconnect($mysql_server, $mysql_user, $mysql_pwd))) { + // smaller servers might benefit from mysql_pconnect, but larger ones + // may run out of connections + if (!($dbc = mysql_connect($mysql_server, $mysql_user, $mysql_pwd))) { $msg = gettext ("Cannot establish connection to database, giving up."); - $msg .= "<BR>"; + $msg .= "<br />"; $msg .= sprintf(gettext ("MySQL error: %s"), mysql_error()); ExitWiki($msg); @@ -43,5 +45,5 @@ if (!mysql_select_db($mysql_db, $dbc)) { $msg = sprintf(gettext ("Cannot open database %s, giving up."), $mysql_db); - $msg .= "<BR>"; + $msg .= "<br />"; $msg .= sprintf(gettext ("MySQL error: %s"), mysql_error()); ExitWiki($msg); @@ -90,5 +92,5 @@ function RetrievePage($dbi, $pagename, $pagestore) { $pagename = addslashes($pagename); - if ($res = mysql_query("select * from $pagestore where pagename='$pagename'", $dbi['dbc'])) { + if ($res = mysql_query("SELECT * FROM $pagestore WHERE pagename='$pagename'", $dbi['dbc'])) { if ($dbhash = mysql_fetch_array($res)) { return MakePageHash($dbhash); @@ -119,8 +121,8 @@ "'$pagehash[refs]', $pagehash[version]"; - if (!mysql_query("replace into $dbi[table] ($COLUMNS) values ($VALUES)", + if (!mysql_query("REPLACE INTO ".$dbi['table']." ($COLUMNS) VALUES ($VALUES)", $dbi['dbc'])) { $msg = sprintf(gettext ("Error writing page '%s'"), $pagename); - $msg .= "<BR>"; + $msg .= "<br />"; $msg .= sprintf(gettext ("MySQL error: %s"), mysql_error()); ExitWiki($msg); @@ -139,5 +141,6 @@ function IsWikiPage($dbi, $pagename) { $pagename = addslashes($pagename); - if ($res = mysql_query("select count(*) from $dbi[table] where pagename='$pagename'", $dbi['dbc'])) { + if ($res = mysql_query("SELECT COUNT(*) FROM ".$dbi['table']." WHERE pagename='$pagename'", + $dbi['dbc'])) { return(mysql_result($res, 0)); } @@ -149,5 +152,6 @@ $pagename = addslashes($pagename); - if ($res = mysql_query("select count(*) from $ArchivePageStore where pagename='$pagename'", $dbi['dbc'])) { + if ($res = mysql_query("SELECT COUNT(*) FROM $ArchivePageStore WHERE pagename='$pagename'", + $dbi['dbc'])) { return(mysql_result($res, 0)); } @@ -165,17 +169,17 @@ $msg .= gettext ("MySQL error: %s"); - if (!mysql_query("delete from $WikiPageStore where pagename='$pagename'", $dbi['dbc'])) + if (!mysql_query("DELETE FROM $WikiPageStore WHERE pagename='$pagename'", $dbi['dbc'])) ExitWiki(sprintf($msg, $pagename, $WikiPageStore, mysql_error())); - if (!mysql_query("delete from $ArchivePageStore where pagename='$pagename'", $dbi['dbc'])) + if (!mysql_query("DELETE FROM $ArchivePageStore WHERE pagename='$pagename'", $dbi['dbc'])) ExitWiki(sprintf($msg, $pagename, $ArchivePageStore, mysql_error())); - if (!mysql_query("delete from $WikiLinksStore where frompage='$pagename'", $dbi['dbc'])) + if (!mysql_query("DELETE FROM $WikiLinksStore WHERE frompage='$pagename'", $dbi['dbc'])) ExitWiki(sprintf($msg, $pagename, $WikiLinksStore, mysql_error())); - if (!mysql_query("delete from $HitCountStore where pagename='$pagename'", $dbi['dbc'])) + if (!mysql_query("DELETE FROM $HitCountStore WHERE pagename='$pagename'", $dbi['dbc'])) ExitWiki(sprintf($msg, $pagename, $HitCountStore, mysql_error())); - if (!mysql_query("delete from $WikiScoreStore where pagename='$pagename'", $dbi['dbc'])) + if (!mysql_query("DELETE FROM $WikiScoreStore WHERE pagename='$pagename'", $dbi['dbc'])) ExitWiki(sprintf($msg, $pagename, $WikiScoreStore, mysql_error())); } @@ -187,11 +191,11 @@ $qpagename = addslashes($pagename); - $res = mysql_query("update $HitCountStore set hits=hits+1" - . " where pagename='$qpagename'", + $res = mysql_query("UPDATE $HitCountStore SET hits=hits+1" + . " WHERE pagename='$qpagename'", $dbi['dbc']); if (!mysql_affected_rows($dbi['dbc'])) { - $res = mysql_query("insert into $HitCountStore (pagename, hits)" - . " values ('$qpagename', 1)", + $res = mysql_query("INSERT INTO $HitCountStore (pagename, hits)" + . " VALUES ('$qpagename', 1)", $dbi['dbc']); } @@ -205,6 +209,6 @@ $qpagename = addslashes($pagename); - $res = mysql_query("select hits from $HitCountStore" - . " where pagename='$qpagename'", + $res = mysql_query("SELECT hits FROM $HitCountStore" + . " WHERE pagename='$qpagename'", $dbi['dbc']); if (mysql_num_rows($res)) @@ -228,7 +232,7 @@ if ($word[0] == '-') { $word = substr($word, 1); - $clause .= "not (LCASE($column) like '%$word%') "; + $clause .= "NOT (LCASE($column) LIKE '%$word%') "; } else { - $clause .= "(LCASE($column) like '%$word%') "; + $clause .= "(LCASE($column) LIKE '%$word%') "; } if ($term = strtok(' ')) @@ -242,6 +246,6 @@ function InitTitleSearch($dbi, $search) { $clause = MakeSQLSearchClause($search, 'pagename'); - $res = mysql_query("select pagename from $dbi[table] where $clause order by pagename", $dbi["dbc"]); - + $res = mysql_query("SELECT pagename FROM ".$dbi['table']." WHERE $clause ORDER BY pagename", + $dbi["dbc"]); return $res; } @@ -262,5 +266,5 @@ function InitFullSearch($dbi, $search) { $clause = MakeSQLSearchClause($search, 'content'); - $res = mysql_query("select * from $dbi[table] where $clause", $dbi["dbc"]); + $res = mysql_query("SELECT * FROM ".$dbi['table']." WHERE $clause", $dbi["dbc"]); return $res; @@ -303,5 +307,6 @@ function InitMostPopular($dbi, $limit) { global $HitCountStore; - $res = mysql_query("select * from $HitCountStore order by hits desc, pagename limit $limit", $dbi["dbc"]); + $res = mysql_query("SELECT * FROM $HitCountStore ORDER BY hits desc, pagename LIMIT $limit", + $dbi["dbc"]); return $res; @@ -317,5 +322,5 @@ function GetAllWikiPageNames($dbi) { global $WikiPageStore; - $res = mysql_query("select pagename from $WikiPageStore", $dbi["dbc"]); + $res = mysql_query("SELECT pagename FROM $WikiPageStore", $dbi["dbc"]); $rows = mysql_num_rows($res); for ($i = 0; $i < $rows; $i++) { @@ -334,5 +339,7 @@ $pagename = addslashes($pagename); - $res = mysql_query("select topage, score from $WikiLinksStore, $WikiScoreStore where topage=pagename and frompage='$pagename' order by score desc, topage"); + $res = mysql_query("SELECT topage, score FROM $WikiLinksStore, $WikiScoreStore" + ." WHERE topage=pagename AND frompage='$pagename'" + ." ORDER BY score DESC, topage"); $rows = mysql_num_rows($res); for ($i = 0; $i < $rows; $i++) { @@ -341,5 +348,7 @@ } - $res = mysql_query("select frompage, score from $WikiLinksStore, $WikiScoreStore where frompage=pagename and topage='$pagename' order by score desc, frompage"); + $res = mysql_query("SELECT frompage, score FROM $WikiLinksStore, $WikiScoreStore" + ." WHERE frompage=pagename AND topage='$pagename'" + ." ORDER BY score DESC, frompage"); $rows = mysql_num_rows($res); for ($i = 0; $i < $rows; $i++) { @@ -348,5 +357,8 @@ } - $res = mysql_query("select distinct pagename, hits from $WikiLinksStore, $HitCountStore where (frompage=pagename and topage='$pagename') or (topage=pagename and frompage='$pagename') order by hits desc, pagename"); + $res = mysql_query("SELECT DISTINCT pagename, hits FROM $WikiLinksStore, $HitCountStore" + ." WHERE (frompage=pagename AND topage='$pagename')" + ." OR (topage=pagename and frompage='$pagename')" + ." ORDER BY hits DESC, pagename"); $rows = mysql_num_rows($res); for ($i = 0; $i < $rows; $i++) { @@ -367,5 +379,5 @@ // first delete the old list of links - mysql_query("delete from $WikiLinksStore where frompage='$frompage'", + mysql_query("DELETE FROM $WikiLinksStore WHERE frompage='$frompage'", $dbi["dbc"]); @@ -377,12 +389,14 @@ $topage = addslashes($topage); if($topage != $frompage) { - mysql_query("insert into $WikiLinksStore (frompage, topage) " . - "values ('$frompage', '$topage')", $dbi["dbc"]); + mysql_query("INSERT INTO $WikiLinksStore (frompage, topage)" + ." VALUES ('$frompage', '$topage')", $dbi["dbc"]); } } // update pagescore - mysql_query("delete from $WikiScoreStore", $dbi["dbc"]); - mysql_query("insert into $WikiScoreStore select w1.topage, count(*) from $WikiLinksStore as w1, $WikiLinksStore as w2 where w2.topage=w1.frompage group by w1.topage", $dbi["dbc"]); + mysql_query("DELETE FROM $WikiScoreStore", $dbi["dbc"]); + mysql_query("INSERT INTO $WikiScoreStore" + ." SELECT w1.topage, COUNT(*) FROM $WikiLinksStore AS w1, $WikiLinksStore AS w2" + ." WHERE w2.topage=w1.frompage GROUP BY w1.topage", $dbi["dbc"]); } |