From 96caf38df226190e6e8a10bf73bdeab1ab7bb032 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Tue, 31 Oct 2006 19:17:19 +0000 Subject: [PATCH] Fixed searches, list of results and simplified SQL logic. All those while trying to fix one LCASE() use. MDL-7310 Merged from MOODLE_17_STABLE --- mod/wiki/ewikimoodlelib.php | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/mod/wiki/ewikimoodlelib.php b/mod/wiki/ewikimoodlelib.php index 133f9a7401..d5a0a74647 100644 --- a/mod/wiki/ewikimoodlelib.php +++ b/mod/wiki/ewikimoodlelib.php @@ -235,22 +235,11 @@ function ewiki_database_moodle($action, &$args, $sw1, $sw2) { $field = implode("", array_keys($args)); $content = strtolower(implode("", $args)); if ($field == "id") { $field = "pagename"; } - switch ($CFG->dbtype) { - case 'postgres7': - $sql= "SELECT pagename AS id, version, flags" . - (EWIKI_DBQUERY_BUFFER && ($field!="pagename") ? ", $field" : "") . - " FROM " . $CFG->prefix.EWIKI_DB_TABLE_NAME . - " WHERE $field ILIKE '%".anydb_escape_string($content)."%' and wiki=".$wiki_entry->id . - " GROUP BY id, pagename, version, flags ". - (EWIKI_DBQUERY_BUFFER && ($field!="pagename") ? ", $field" : "") ; - break; - default: - $sql= "SELECT pagename AS id, version, flags" . - (EWIKI_DBQUERY_BUFFER && ($field!="pagename") ? ", $field" : "") . - " FROM " . $CFG->prefix.EWIKI_DB_TABLE_NAME . - " WHERE LOCATE('" . anydb_escape_string($content) . "', LCASE($field)) and wiki=".$wiki_entry->id . - " GROUP BY id, version DESC"; - } + $sql= "SELECT pagename AS id, version, flags" . + (EWIKI_DBQUERY_BUFFER && ($field!="pagename") ? ", $field" : "") . + " FROM " . $CFG->prefix.EWIKI_DB_TABLE_NAME . + " WHERE $field " . sql_ilike() . " '%".anydb_escape_string($content)."%' and wiki=".$wiki_entry->id . + " ORDER BY id, version ASC"; $result=get_records_sql($sql); $r = new ewiki_dbquery_result(array("id","version",$field)); -- 2.39.5