- Fixing come incompatilities with PostgreSQL.

THANKS TO ULRIK PETERSON!

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 3c2d3f59515b063540eb79d19da7c2b0c3062283..520f865cb5fafbb046b701dacae8bccc6828f39d 100644 (file)
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -729,17 +729,21 @@ function glossary_search($course, $searchterms, $extended = 0, $glossary = NULL)
     }
 
     /// Some differences in syntax for entrygreSQL
-    if ($CFG->dbtype == "entrygres7") {
+    switch ($CFG->dbtype) {
+    case 'postgres7':
         $LIKE = "ILIKE";   // case-insensitive
         $NOTLIKE = "NOT ILIKE";   // case-insensitive
         $REGEXP = "~*";
         $NOTREGEXP = "!~*";
-    } else {
+    break;
+    case 'mysql':
+    default:
         $LIKE = "LIKE";
         $NOTLIKE = "NOT LIKE";
         $REGEXP = "REGEXP";
         $NOTREGEXP = "NOT REGEXP";
-    }
+    break;
+    }    
 
     $conceptsearch = "";
     $definitionsearch = "";

diff --git a/mod/glossary/sql.php b/mod/glossary/sql.php
index 46b90b67ac148d49e47f94af8c6d61fff58d6958..bd3ed71fbc6d238ea99984c020a558a2863c89d2 100644 (file)
--- a/mod/glossary/sql.php
+++ b/mod/glossary/sql.php
@@ -203,9 +203,18 @@
     } 
     $count = count_records_sql("select count(*) $sqlfrom $sqlwhere");
     $sqllimit = '';
+    
     if ( $offset >= 0 ) {
-        $sqllimit = " LIMIT $offset, $entriesbypage";
+           switch ($CFG->dbtype) {
+        case 'postgres7':
+               $sqllimit = " LIMIT $entriesbypage OFFSET $offset";
+        break;
+        case 'mysql':
+               $sqllimit = " LIMIT $offset, $entriesbypage";
+        break;
+        }    
     }
+    
     $allentries = get_records_sql("$sqlselect $sqlfrom $sqlwhere $sqlorderby $sqllimit");
 
 ?>
\ No newline at end of file