L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed showentry for POstgreSQLo

Browse Source 
Moved SQL to its own function in lib.php
Added links to glossary for each entry
This commit is contained in:
moodler
2004-08-25 07:36:29 +00:00
parent 1281b0a7df
commit afa051933d
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/glossary/lib.php
+17
View File
@@ -478,6 +478,23 @@ function glossary_get_entries($glossaryid, $entrylist, $pivot = "") {
WHERE glossaryid = '$glossaryid'
AND id IN ($entrylist)");
}
function glossary_get_entries_search($concept, $courseid) {
global $CFG;
$conceptupper = strtoupper(trim($concept));
return get_records_sql("SELECT e.*, g.name as glossaryname
FROM {$CFG->prefix}glossary_entries e,
{$CFG->prefix}glossary g
WHERE e.glossaryid = g.id
AND ( (e.casesensitive != 0 and UPPER(concept) = '$conceptupper')
OR (e.casesensitive = 0 and concept = '$concept'))
AND (g.course = '$courseid' OR g.globalglossary = 1)
AND e.usedynalink != 0
AND g.usedynalink != 0");
}
function glossary_get_entries_sorted($glossary, $where="", $orderby="", $pivot = "") {
global $CFG;
if ($where) {
mod/glossary/showentry.php
+9 -11
View File
@@ -12,19 +12,17 @@
}
if ($eid) {
$entries[] = get_record("glossary_entries", "id", $eid);
$entry = get_record("glossary_entries", "id", $eid);
$glossary = get_record('glossary','id',$entry->glossaryid);
$entry->glossaryname = $glossary->name;
$entries[] = $entry;
} else if ($concept) {
$entries = get_records_sql("select e.* from {$CFG->prefix}glossary_entries e, {$CFG->prefix}glossary g".
" where e.glossaryid = g.id and".
" (e.casesensitive != 0 and ucase(concept) = '" . strtoupper(trim($concept)). "' or".
" e.casesensitive = 0 and concept = '$concept') and".
" (g.course = $courseid or g.globalglossary) and".
" e.usedynalink != 0 and g.usedynalink != 0");
$entries = glossary_get_entries_search($concept, $courseid);
}
foreach ($entries as $entry) {
$glossary = get_record('glossary','id',$entry->glossaryid);
foreach ($entries as $key => $entry) {
$entries[$key]->definition .= "<p align=\"right\">&raquo;&nbsp;<a target=\"_blank\" onClick=\"window.opener.location.href='$CFG->wwwroot/mod/glossary/view.php?g=$entry->glossaryid'\" href=\"$CFG->wwwroot/mod/glossary/view.php?g=$entry->glossaryid\">$entry->glossaryname</a></p>";
}
if (!empty($courseid)) {
@@ -38,10 +36,10 @@
$CFG->framename = "newwindow";
if ($course->category) {
print_header(strip_tags("$course->shortname: $glossary->name"), "$course->fullname",
print_header(strip_tags("$course->shortname: $strglossaries $strsearch"), "$course->fullname",
"<a target=\"newwindow\" href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $strglossaries -> $strsearch", "", "", true, "&nbsp;", "&nbsp;");
} else {
print_header(strip_tags("$course->shortname: $glossary->name"), "$course->fullname",
print_header(strip_tags("$course->shortname: $strglossaries $strsearch"), "$course->fullname",
"$strglossaries -> $strsearch", "", "", true, "&nbsp;", "&nbsp;");
}