Index: openacs-4/packages/glossar/lib/glossar-term-list-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/lib/glossar-term-list-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/glossar/lib/glossar-term-list-postgresql.xql 20 Aug 2005 09:37:50 -0000 1.1 +++ openacs-4/packages/glossar/lib/glossar-term-list-postgresql.xql 13 Oct 2005 20:22:55 -0000 1.2 @@ -37,6 +37,39 @@ + + + select + g.object_id, + g.title as glossar_title, + g.description as glossar_comment, + g.source_category_id, + g.target_category_id + from + gl_glossarsx g, + cr_items i + where + g.context_id = :glossar_id + and i.item_id = g.context_id + and i.latest_revision = g.object_id + + + + + + select + ci.item_id, + cr.title, + ci.name + from + cr_items ci, + cr_revisions cr + where + ci.parent_id = :glossar_id + and ci.live_revision = cr.revision_id + + + postgresql Index: openacs-4/packages/glossar/lib/glossar-term-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/lib/glossar-term-list.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/glossar/lib/glossar-term-list.adp 23 Aug 2005 19:40:47 -0000 1.2 +++ openacs-4/packages/glossar/lib/glossar-term-list.adp 13 Oct 2005 20:22:55 -0000 1.3 @@ -1,10 +1,41 @@ + + + + + + +
+
+ #glossar.Search#:
+ + @hidden_vars;noquote@ + +
+
          + + + + + + + + + + + + + + + + + + + + + +
#glossar.Title#: @glossar_title@
#glossar.Comment#: @glossar_comment;noquote@
#glossar.glossar_single_category#: @glossar_language;noquote@
#glossar.glossar_target_category#: @glossar_target_lan;noquote@
#glossar.Files#: @files;noquote@
+
+
-
- #glossar.Search#:
- - @hidden_vars;noquote@ - - -
Index: openacs-4/packages/glossar/lib/glossar-term-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/lib/glossar-term-list.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/glossar/lib/glossar-term-list.tcl 20 Aug 2005 09:37:51 -0000 1.1 +++ openacs-4/packages/glossar/lib/glossar-term-list.tcl 13 Oct 2005 20:22:55 -0000 1.2 @@ -18,8 +18,32 @@ } } +# Get glossar info +set glossar_info [db_1row get_glossar_info { }] +set glossar_language [category::get_name $source_category_id] +set glossar_target_lan [category::get_name $target_category_id] +if {[empty_string_p $glossar_language] } { + set glossar_language "
- - - - - - - - -
" +} + +if {[empty_string_p $glossar_target_lan] } { + set glossar_target_lan "
- - - - - - - - -
" +} + +# get all the files +set files [list] +db_foreach get_files { } { + lappend files "$title" +} + +if {[empty_string_p $files] } { + set files "
- - - - - - - - -
" +} else { + set files [join $files ",  "] +} + if {![info exists format]} { set format "normal" }