Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.82 -r1.83
--- openacs-4/packages/dotlrn/dotlrn.info	16 May 2002 03:56:31 -0000	1.82
+++ openacs-4/packages/dotlrn/dotlrn.info	16 May 2002 13:29:14 -0000	1.83
@@ -142,6 +142,8 @@
             <file type="tcl_procs" path="tcl/applets-procs.tcl"/>
             <file type="query_file" path="tcl/applets-procs.xql"/>
             <file type="tcl_procs" path="tcl/class-applets-procs.tcl"/>
+            <file type="query_file" db_type="oracle" path="tcl/class-procs-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="tcl/class-procs-postgresql.xql"/>
             <file type="tcl_procs" path="tcl/class-procs.tcl"/>
             <file type="query_file" path="tcl/class-procs.xql"/>
             <file type="tcl_procs" path="tcl/club-procs.tcl"/>
@@ -179,8 +181,10 @@
             <file type="content_page" path="www/admin/class-edit.tcl"/>
             <file type="query_file" path="www/admin/class-edit.xql"/>
             <file type="query_file" db_type="oracle" path="www/admin/class-instance-new-oracle.xql"/>
+            <file type="query_file" db_type="postgresql" path="www/admin/class-instance-new-postgresql.xql"/>
             <file type="content_page" path="www/admin/class-instance-new.adp"/>
             <file type="content_page" path="www/admin/class-instance-new.tcl"/>
+            <file type="query_file" path="www/admin/class-instance-new.xql"/>
             <file type="content_page" path="www/admin/class-new.adp"/>
             <file type="content_page" path="www/admin/class-new.tcl"/>
             <file type="content_page" path="www/admin/class.adp"/>
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/tcl/class-procs-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/tcl/class-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/class-procs-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/tcl/class-procs-postgresql.xql	16 May 2002 13:29:14 -0000	1.1
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="dotlrn_class::can_instantiate.can_instantiate">
+        <querytext>
+            select count(*)
+            from dual
+            where exists (select 1
+                          from dotlrn_terms
+                          where dotlrn_terms.end_date > now())
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/dotlrn/tcl/class-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/dotlrn/tcl/class-procs.tcl	12 May 2002 21:55:17 -0000	1.34
+++ openacs-4/packages/dotlrn/tcl/class-procs.tcl	16 May 2002 13:29:14 -0000	1.35
@@ -150,7 +150,6 @@
     } {
         set term [dotlrn_term::get_term_name -term_id $term_id]
         set year [dotlrn_term::get_term_year -term_id $term_id]
-        set community_key [dotlrn::generate_key -name "${class_key}-${term}-${year}"]
 
         set extra_vars [ns_set create]
         ns_set put $extra_vars term_id $term_id
@@ -160,6 +159,7 @@
         if {[empty_string_p $pretty_name]} {
             set pretty_name  "[dotlrn_community::get_community_type_name $class_key]; $term $year"
         }
+        set community_key [dotlrn::generate_key -name "${pretty_name}"]
 
         db_transaction {
             # Create the community
Index: openacs-4/packages/dotlrn/tcl/class-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.xql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/tcl/class-procs.xql	1 May 2002 01:19:47 -0000	1.12
+++ openacs-4/packages/dotlrn/tcl/class-procs.xql	16 May 2002 13:29:15 -0000	1.13
@@ -38,18 +38,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="dotlrn_class::can_instantiate.can_instantiate">
-        <querytext>
-            select count(*)
-            from dotlrn_terms
-            where dotlrn_terms.end_date > sysdate
-            and not exists (select 1
-                            from dotlrn_class_instances
-                            where dotlrn_class_instances.class_key = :class_key
-                            and dotlrn_class_instances.term_id = dotlrn_terms.term_id)
-        </querytext>
-    </fullquery>
-
     <fullquery name="dotlrn_class::check_class_key_valid_p.collision_check">
         <querytext>
             select 1
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.52 -r1.53
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	16 May 2002 05:17:09 -0000	1.52
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	16 May 2002 13:29:15 -0000	1.53
@@ -43,7 +43,7 @@
     } {
 	Returns the group type key used for class groups
     } {
-	return [parameter "class_group_type_key"]
+	return [parameter class_group_type_key]
     }
 
     ad_proc -public group_type_key {
Index: openacs-4/packages/dotlrn/www/admin/class-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/class-edit.tcl	29 Mar 2002 19:14:47 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/class-edit.tcl	16 May 2002 13:29:15 -0000	1.3
@@ -22,7 +22,7 @@
     @version $Id$
 } -query {
     class_key:notnull
-    {referer "classes"}
+    {referer classes}
 } -properties {
     title:onevalue
     context_bar:onevalue
@@ -39,26 +39,26 @@
 form create edit_class
 
 element create edit_class class_key \
-    -label "[ad_parameter classes_pretty_name] Key (a short name, no spaces)" \
+    -label "Class Key (a short name, no spaces)" \
     -datatype text \
     -widget hidden \
     -value $class_key
 
 element create edit_class pretty_name \
-    -label "Name" \
+    -label Name \
     -datatype text \
     -widget text \
     -html {size 60}
 
 element create edit_class description \
-    -label "Description" \
+    -label Description \
     -datatype text \
     -widget textarea \
     -html {rows 5 cols 60 wrap soft} \
     -optional
 
 element create edit_class referer \
-    -label "Referer" \
+    -label Referer \
     -datatype text \
     -widget hidden \
     -value $referer
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/class-instance-new-oracle.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/class-instance-new-oracle.xql	1 May 2002 01:19:47 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new-oracle.xql	16 May 2002 13:29:15 -0000	1.6
@@ -3,25 +3,12 @@
 <queryset>
     <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-    <fullquery name="select_class_info">
-        <querytext>
-            select pretty_name as class_name,
-                   description as class_description
-            from dotlrn_classes_full
-            where class_key = :class_key
-        </querytext>
-    </fullquery>
-
     <fullquery name="select_terms_for_select_widget">
         <querytext>
             select dotlrn_terms.term_name || ' ' || dotlrn_terms.term_year as term,
                    dotlrn_terms.term_id
             from dotlrn_terms
             where dotlrn_terms.end_date > sysdate
-            and not exists (select 1
-                            from dotlrn_class_instances
-                            where dotlrn_class_instances.class_key = :class_key
-                            and dotlrn_class_instances.term_id = dotlrn_terms.term_id)
             order by dotlrn_terms.start_date
         </querytext>
     </fullquery>
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/class-instance-new-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new-postgresql.xql	16 May 2002 13:29:15 -0000	1.1
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="select_terms_for_select_widget">
+        <querytext>
+            select dotlrn_terms.term_name || ' ' || dotlrn_terms.term_year as term,
+                   dotlrn_terms.term_id
+            from dotlrn_terms
+            where dotlrn_terms.end_date > now()
+            order by dotlrn_terms.start_date
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	29 Mar 2002 19:14:47 -0000	1.17
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	16 May 2002 13:29:15 -0000	1.18
@@ -33,21 +33,21 @@
 form create add_class_instance
 
 element create add_class_instance term \
-    -label "Term" \
+    -label Term \
     -datatype integer \
     -widget select \
     -options [db_list_of_lists select_terms_for_select_widget {}]
 
 element create add_class_instance pretty_name \
-    -label "Name" \
+    -label Name \
     -datatype text \
     -widget text \
     -html {size 60} \
     -value $class_name \
     -optional
 
 element create add_class_instance description \
-    -label "Description" \
+    -label Description \
     -datatype text \
     -widget textarea \
     -html {rows 5 cols 60 wrap soft} \
@@ -61,7 +61,7 @@
     -options {{Open open} {"Needs Approval" "needs approval"} {Closed closed}}
 
 element create add_class_instance class_key \
-    -label "[ad_parameter classes_pretty_name] Key" \
+    -label "[dotlrn::parameter classes_pretty_name] Key" \
     -datatype text \
     -widget hidden \
     -value $class_key
@@ -74,7 +74,7 @@
     -value 1
 
 element create add_class_instance referer \
-    -label "Referer" \
+    -label Referer \
     -datatype text \
     -widget hidden \
     -value $referer
@@ -104,11 +104,11 @@
     ad_script_abort
 }
 
-set class_instances_pretty_name [ad_parameter "class_instances_pretty_name"]
+set class_instances_pretty_name [dotlrn::parameter class_instances_pretty_name]
 
 set context_bar [list \
     {classes Classes} \
-    [list "class?class_key=$class_key" "$class_name"] \
+    [list "class?class_key=$class_key" $class_name] \
     [list New $class_instances_pretty_name] \
 ]
 
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.xql	16 May 2002 13:29:15 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+    <fullquery name="select_class_info">
+        <querytext>
+            select pretty_name as class_name,
+                   description as class_description
+            from dotlrn_classes_full
+            where class_key = :class_key
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/dotlrn/www/admin/class-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/class-new.tcl	29 Mar 2002 19:14:47 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/class-new.tcl	16 May 2002 13:29:15 -0000	1.10
@@ -23,46 +23,39 @@
     @version $Id$
 } -query {
     {department_key ""}
-    {referer "classes"}
+    {referer classes}
 } -properties {
     title:onevalue
     context_bar:onevalue
 }
 
-set title "New [ad_parameter classes_pretty_name]"
-set context_bar [list [list classes [ad_parameter classes_pretty_plural]] New]
+set title "New [dotlrn::parameter classes_pretty_name]"
+set context_bar [list [list classes [dotlrn::parameter classes_pretty_plural]] New]
 
 form create add_class
 
-if {[empty_string_p $department_key]} {
-    element create add_class department_key \
-        -label "[ad_parameter departments_pretty_name]" \
-        -datatype text \
-        -widget select \
-        -options [dotlrn_department::select_as_list]
-} else {
-    element create add_class department_key \
-        -label "[ad_parameter departments_pretty_name]" \
-        -datatype text \
-        -widget hidden \
-        -value $department_key
-}
+element create add_class department_key \
+    -label [dotlrn::parameter departments_pretty_name] \
+    -datatype text \
+    -widget select \
+    -options [dotlrn_department::select_as_list] \
+    -value $department_key
 
 element create add_class pretty_name \
-    -label "Name" \
+    -label Name \
     -datatype text \
     -widget text \
     -html {size 60}
 
 element create add_class description \
-    -label "Description" \
+    -label Description \
     -datatype text \
     -widget textarea \
     -html {rows 5 cols 60 wrap soft} \
     -optional
 
 element create add_class referer \
-    -label "Referer" \
+    -label Referer \
     -datatype text \
     -widget hidden \
     -value $referer
Index: openacs-4/packages/dotlrn/www/admin/class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn/www/admin/class.adp	29 Mar 2002 19:14:47 -0000	1.16
+++ openacs-4/packages/dotlrn/www/admin/class.adp	16 May 2002 13:29:15 -0000	1.17
@@ -37,16 +37,16 @@
   <br>
 
   <li>
-    <a href="class-edit?class_key=@class_key@&referer=@referer@">Edit</a> <%= [ad_parameter "classes_pretty_name"] %> properties.
+    <a href="class-edit?class_key=@class_key@&referer=@referer@">Edit</a> <%= [dotlrn::parameter classes_pretty_name] %> properties.
   </li>
 
 </ul>
 
 <br>
 
 <p>
-<if @can_instantiate@ ne 0>
-  [<small><a href="class-instance-new?class_key=@class_key@">New <%= [ad_parameter "class_instances_pretty_name"] %></a></small>]
+<if @can_instantiate@>
+  [<small><a href="class-instance-new?class_key=@class_key@">New <%= [dotlrn::parameter class_instances_pretty_name] %></a></small>]
 </if>
 <else>
 <include src="need-term-note">
@@ -70,7 +70,7 @@
   <tr>
     <th align="left" width="15%">Term</th>
     <th align="left" width="50%">
-      <%= [ad_parameter "class_instances_pretty_name"] %> Name
+      <%= [dotlrn::parameter class_instances_pretty_name] %> Name
     </th>
     <th align="left">Actions</th>
   </tr>
Index: openacs-4/packages/dotlrn/www/admin/class.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/www/admin/class.tcl	29 Mar 2002 19:14:47 -0000	1.9
+++ openacs-4/packages/dotlrn/www/admin/class.tcl	16 May 2002 13:29:15 -0000	1.10
@@ -33,7 +33,7 @@
 
 # Get information about that class
 if {![db_0or1row select_class_info {}]} {
-    ad_returnredirect "classes"
+    ad_returnredirect classes
     ad_script_abort
 }
 
@@ -51,7 +51,7 @@
 form create term_form
 
 element create term_form term_id \
-    -label "Term" \
+    -label Term \
     -datatype integer \
     -widget select \
     -options $terms \
@@ -68,16 +68,16 @@
     form get_values term_form term_id class_key
 }
 
-set query "select_class_instances"
+set query select_class_instances
 if {$term_id == -1} {
-    set query "select_all_class_instances"
+    set query select_all_class_instances
 }
 
 db_multirow class_instances $query {}
 
 set can_instantiate [dotlrn_class::can_instantiate -class_key $class_key]
 
-set context_bar [list [list classes [ad_parameter "classes_pretty_plural"]] $pretty_name]
+set context_bar [list [list classes [dotlrn::parameter classes_pretty_plural]] $pretty_name]
 set referer "[ns_conn url]?[ns_conn query]"
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	29 Mar 2002 19:14:47 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	16 May 2002 13:29:15 -0000	1.9
@@ -18,7 +18,7 @@
 
 %>
 
-<if @can_create@ gt 0>
+<if @can_create@>
 [<small><a href="class-new?department_key=@department_key@&referer=@referer@">New <%= [ad_parameter classes_pretty_name] %></a></small>]
 </if>
 
@@ -28,7 +28,7 @@
   <tr>
     <th align="left" width="50%">
 <formtemplate id="department_form">
-      <%= [ad_parameter departments_pretty_name] %>:&nbsp;<formwidget id="department_key">
+      <%= [dotlrn::parameter departments_pretty_name] %>:&nbsp;<formwidget id="department_key">
 </formtemplate>
     </th>
   </tr>
@@ -39,8 +39,8 @@
 <if @classes:rowcount@ gt 0>
 <table width="100%">
   <tr>
-    <th align="left" width="30%"><%= [ad_parameter departments_pretty_name] %></th>
-    <th align="left"><%= [ad_parameter classes_pretty_name] %> Name</th>
+    <th align="left" width="30%"><%= [dotlrn::parameter departments_pretty_name] %></th>
+    <th align="left"><%= [dotlrn::parameter classes_pretty_name] %> Name</th>
   </tr>
 <multiple name="classes">
   <tr>
@@ -51,6 +51,7 @@
 </table>
 </if>
 
-<if @can_create@ gt 0 and @classes:rowcount@ gt 10>
-[<small><a href="class-new?department_key=@department_key@&referer=@referer@">New <%= [ad_parameter classes_pretty_name] %></a></small>]
+<if @can_create@ and @classes:rowcount@ gt 10>
+[<small><a
+href="class-new?department_key=@department_key@&referer=@referer@">New <%= [dotlrn::parameter classes_pretty_name] %></a></small>]
 </if>
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl	29 Mar 2002 19:14:47 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl	16 May 2002 13:29:15 -0000	1.5
@@ -42,7 +42,7 @@
 form create department_form
 
 element create department_form department_key \
-    -label "Department" \
+    -label Department \
     -datatype text \
     -widget select \
     -options $departments \
@@ -57,9 +57,9 @@
     set referer "classes?[export_vars department_key]"
 }
 
-set query "select_classes"
+set query select_classes
 if {![empty_string_p $department_key]} {
-    set query "select_classes_by_department"
+    set query select_classes_by_department
 }
 
 db_multirow classes $query {}
Index: openacs-4/packages/dotlrn/www/admin/classes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/admin/classes.tcl	29 Mar 2002 19:14:47 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/classes.tcl	16 May 2002 13:29:15 -0000	1.11
@@ -27,7 +27,7 @@
     context_bar:onevalue
 }
 
-set title "[ad_parameter classes_pretty_plural]"
-set context_bar "[ad_parameter classes_pretty_plural]"
+set title [dotlrn::parameter classes_pretty_plural]
+set context_bar [dotlrn::parameter classes_pretty_plural]
 
 ad_return_template