Index: openacs-4/packages/assessment/tcl/as-assessment-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-assessment-procs-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/tcl/as-assessment-procs-postgresql.xql	18 Jan 2005 12:42:36 -0000	1.4
+++ openacs-4/packages/assessment/tcl/as-assessment-procs-postgresql.xql	23 Jan 2005 18:10:48 -0000	1.5
@@ -7,7 +7,7 @@
 
 	select a.assessment_id as assessment_rev_id, cr.item_id as assessment_id, cr.title, ci.name,
 	       cr.description, o.creation_user, o.creation_date, a.instructions, a.run_mode,
-	       a.anonymous_p, a.secure_access_p, a.reuse_responses_p,
+	       a.anonymous_p, a.secure_access_p, a.reuse_responses_p, a.ip_mask,
 	       a.show_item_name_p, a.entry_page, a.exit_page, a.consent_page, a.return_url,
 	       a.start_time, a.end_time, a.number_tries, a.wait_between_tries,
 	       a.time_for_response, a.show_feedback, a.section_navigation, a.creator_id, a.survey_p
@@ -35,4 +35,27 @@
 	</querytext>
 </fullquery>
 	
+<fullquery name="as::assessment::check_session_conditions.assessment_data">
+	<querytext>
+
+	select a.number_tries, a.wait_between_tries, a.ip_mask,
+	       to_char(a.start_time, 'YYYY-MM-DD HH24:MI:SS') as start_time,
+	       to_char(a.end_time, 'YYYY-MM-DD HH24:MI:SS') as end_time,
+	       to_char(now(), 'YYYY-MM-DD HH24:MI:SS') as cur_time
+	from as_assessments a
+	where a.assessment_id = :assessment_id
+
+	</querytext>
+</fullquery>
+	
+<fullquery name="as::assessment::check_session_conditions.cur_wait_time">
+	<querytext>
+
+	select round(date_part('epoch', now() - completed_datetime)) as cur_wait_time
+	from as_sessions
+	where session_id = :last_session_id
+
+	</querytext>
+</fullquery>
+	
 </queryset>