Index: openacs-4/packages/survey/www/one-respondent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-respondent.tcl,v
diff -u -N -r1.8 -r1.8.2.1
--- openacs-4/packages/survey/www/one-respondent.tcl	6 Nov 2013 07:33:54 -0000	1.8
+++ openacs-4/packages/survey/www/one-respondent.tcl	7 Aug 2014 07:11:46 -0000	1.8.2.1
@@ -13,7 +13,7 @@
     @cvs-id  $Id$
 } {
 
-    survey_id:integer
+    survey_id:naturalnum,notnull
     {return_url ""}
 
 } -validate {
Index: openacs-4/packages/survey/www/process-response.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/process-response.tcl,v
diff -u -N -r1.15 -r1.15.2.1
--- openacs-4/packages/survey/www/process-response.tcl	6 Nov 2013 07:33:54 -0000	1.15
+++ openacs-4/packages/survey/www/process-response.tcl	7 Aug 2014 07:11:46 -0000	1.15.2.1
@@ -15,12 +15,12 @@
     @cvs-id $Id$
 
 } {
-  survey_id:integer
-  section_id:integer
-  {initial_response_id:integer 0}
+  survey_id:naturalnum,notnull
+  section_id:naturalnum,notnull
+  {initial_response_id:naturalnum,notnull 0}
   return_url:optional
   response_to_question:array,optional,multiple,html
-  new_response_id:integer
+  new_response_id:naturalnum,notnull
 } -validate {
 
     section_exists -requires { section_id } {
Index: openacs-4/packages/survey/www/respond.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/respond.tcl,v
diff -u -N -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/survey/www/respond.tcl	29 Jul 2014 11:42:12 -0000	1.9.2.1
+++ openacs-4/packages/survey/www/respond.tcl	7 Aug 2014 07:11:46 -0000	1.9.2.2
@@ -12,8 +12,8 @@
 } {
     
     survey_id:naturalnum,notnull
-    {section_id:integer 0}
-    {response_id:integer 0}
+    {section_id:naturalnum,notnull 0}
+    {response_id:naturalnum,notnull 0}
     return_url:optional
 
 } -validate {
Index: openacs-4/packages/survey/www/admin/description-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/description-edit.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/survey/www/admin/description-edit.tcl	6 Nov 2013 07:33:54 -0000	1.6
+++ openacs-4/packages/survey/www/admin/description-edit.tcl	7 Aug 2014 07:11:46 -0000	1.6.2.1
@@ -10,7 +10,7 @@
     @cvs-id $Id$
 } {
 
-    survey_id:integer
+    survey_id:naturalnum,notnull
 
 }
 
Index: openacs-4/packages/survey/www/admin/modify-responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/modify-responses.tcl,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/survey/www/admin/modify-responses.tcl	6 Nov 2013 07:33:54 -0000	1.3
+++ openacs-4/packages/survey/www/admin/modify-responses.tcl	7 Aug 2014 07:11:47 -0000	1.3.2.1
@@ -10,8 +10,8 @@
     @cvs-id $Id$
 } {
 
-    question_id:integer
-    section_id:integer
+    question_id:naturalnum,notnull
+    section_id:naturalnum,notnull
 
 }
 
Index: openacs-4/packages/survey/www/admin/name-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/name-edit.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/survey/www/admin/name-edit.tcl	6 Nov 2013 07:33:54 -0000	1.6
+++ openacs-4/packages/survey/www/admin/name-edit.tcl	7 Aug 2014 07:11:47 -0000	1.6.2.1
@@ -10,7 +10,7 @@
     @cvs-id $Id$
 } {
 
-    survey_id:integer
+    survey_id:naturalnum,notnull
     {name ""}
     {description:html ""}
 }
Index: openacs-4/packages/survey/www/admin/one-respondent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one-respondent.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/survey/www/admin/one-respondent.tcl	6 Nov 2013 07:33:54 -0000	1.6
+++ openacs-4/packages/survey/www/admin/one-respondent.tcl	7 Aug 2014 07:11:47 -0000	1.6.2.1
@@ -10,8 +10,8 @@
     @cvs-id $Id$
 } {
 
-    user_id:integer
-    survey_id:integer
+    user_id:naturalnum,notnull
+    survey_id:naturalnum,notnull
 
 } 
 
Index: openacs-4/packages/survey/www/admin/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one.tcl,v
diff -u -N -r1.10 -r1.10.2.1
--- openacs-4/packages/survey/www/admin/one.tcl	6 Nov 2013 07:33:54 -0000	1.10
+++ openacs-4/packages/survey/www/admin/one.tcl	7 Aug 2014 07:11:47 -0000	1.10.2.1
@@ -11,8 +11,8 @@
     @cvs-id $Id$
 } {
 
-    survey_id:integer
-    {section_id:integer ""}
+    survey_id:naturalnum,notnull
+    {section_id:naturalnum ""}
 }
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/survey/www/admin/process-response.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/process-response.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/survey/www/admin/process-response.tcl	6 Nov 2013 07:33:54 -0000	1.5
+++ openacs-4/packages/survey/www/admin/process-response.tcl	7 Aug 2014 07:11:47 -0000	1.5.2.1
@@ -15,13 +15,13 @@
     @date    1 April 2003
     @cvs-id $Id$
 } {
-  survey_id:integer
-  section_id:integer
-  {initial_response_id:integer 0}
-  {edited_response_id:integer 0}
+  survey_id:naturalnum,notnull
+  section_id:naturalnum,notnull
+  {initial_response_id:naturalnum,notnull 0}
+  {edited_response_id:naturalnum,notnull 0}
   return_url:optional
   response_to_question:array,optional,multiple,html
-  new_response_id:integer
+  new_response_id:naturalnum,notnull
 } -validate {
 
     section_exists -requires { section_id } {
Index: openacs-4/packages/survey/www/admin/question-active-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-active-toggle.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/survey/www/admin/question-active-toggle.tcl	6 Nov 2013 07:33:54 -0000	1.2
+++ openacs-4/packages/survey/www/admin/question-active-toggle.tcl	7 Aug 2014 07:11:47 -0000	1.2.2.1
@@ -9,8 +9,8 @@
     @cvs-id question-active-toggle.tcl,v 1.5.2.4 2000/07/21 04:04:11 ron Exp
 } {
 
-    section_id:integer
-    question_id:integer
+    section_id:naturalnum,notnull
+    question_id:naturalnum,notnull
 
 }
 
Index: openacs-4/packages/survey/www/admin/question-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-add-2.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/survey/www/admin/question-add-2.tcl	6 Nov 2013 07:33:54 -0000	1.5
+++ openacs-4/packages/survey/www/admin/question-add-2.tcl	7 Aug 2014 07:11:47 -0000	1.5.2.1
@@ -18,7 +18,7 @@
     @cvs-id $Id$
 } {
 
-    section_id:integer
+    section_id:naturalnum,notnull
     question_text:html,notnull
     presentation_type
     {after:integer ""}
Index: openacs-4/packages/survey/www/admin/question-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-add.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/survey/www/admin/question-add.tcl	6 Nov 2013 07:33:54 -0000	1.6
+++ openacs-4/packages/survey/www/admin/question-add.tcl	7 Aug 2014 07:11:47 -0000	1.6.2.1
@@ -10,7 +10,7 @@
     @date    February 9, 2000
     @cvs-id $Id$
 } {
-    section_id:integer
+    section_id:naturalnum,notnull
     {after:integer ""}
     
 }
Index: openacs-4/packages/survey/www/admin/question-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-delete.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/survey/www/admin/question-delete.tcl	6 Nov 2013 07:33:55 -0000	1.6
+++ openacs-4/packages/survey/www/admin/question-delete.tcl	7 Aug 2014 07:11:47 -0000	1.6.2.1
@@ -11,7 +11,7 @@
     @cvs-id question-delete.tcl,v 1.5.2.4 2000/07/21 04:04:15 ron Exp
 } {
 
-    question_id:integer
+    question_id:naturalnum,notnull
     {sort_order ""}
 }
 
Index: openacs-4/packages/survey/www/admin/question-modify-text.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-modify-text.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/survey/www/admin/question-modify-text.tcl	6 Nov 2013 07:33:55 -0000	1.5
+++ openacs-4/packages/survey/www/admin/question-modify-text.tcl	7 Aug 2014 07:11:47 -0000	1.5.2.1
@@ -11,8 +11,8 @@
     @cvs-id  $Id$
 } {
 
-    question_id:integer
-    section_id:integer
+    question_id:naturalnum,notnull
+    section_id:naturalnum,notnull
 
 }
 
Index: openacs-4/packages/survey/www/admin/question-modify.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-modify.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/survey/www/admin/question-modify.tcl	6 Nov 2013 07:33:55 -0000	1.5
+++ openacs-4/packages/survey/www/admin/question-modify.tcl	7 Aug 2014 07:11:48 -0000	1.5.2.1
@@ -11,8 +11,8 @@
     @cvs-id  $Id$
 } {
 
-    question_id:integer
-    section_id:integer
+    question_id:naturalnum,notnull
+    section_id:naturalnum,notnull
     {valid_responses ""}
     {presentation_options ""}
     {sort_order ""}
Index: openacs-4/packages/survey/www/admin/question-required-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-required-toggle.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/survey/www/admin/question-required-toggle.tcl	6 Nov 2013 07:33:55 -0000	1.2
+++ openacs-4/packages/survey/www/admin/question-required-toggle.tcl	7 Aug 2014 07:11:48 -0000	1.2.2.1
@@ -14,8 +14,8 @@
 } {
 
     required_p:notnull
-    section_id:integer
-    question_id:integer
+    section_id:naturalnum,notnull
+    question_id:naturalnum,notnull
 
 }
 
Index: openacs-4/packages/survey/www/admin/respond.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/respond.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/survey/www/admin/respond.tcl	6 Nov 2013 07:33:55 -0000	1.4
+++ openacs-4/packages/survey/www/admin/respond.tcl	7 Aug 2014 07:11:48 -0000	1.4.2.1
@@ -13,10 +13,10 @@
     @cvs-id $Id$
 } {
 
-    user_id:integer
-    survey_id:integer
-    {section_id:integer 0}
-    {response_id:integer 0} 
+    user_id:naturalnum,notnull
+    survey_id:naturalnum,notnull
+    {section_id:naturalnum,notnull 0}
+    {response_id:naturalnum,notnull 0} 
     return_url:optional
 
 } -validate {
Index: openacs-4/packages/survey/www/admin/response-editable-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/response-editable-toggle.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/survey/www/admin/response-editable-toggle.tcl	6 Nov 2013 07:33:55 -0000	1.2
+++ openacs-4/packages/survey/www/admin/response-editable-toggle.tcl	7 Aug 2014 07:11:48 -0000	1.2.2.1
@@ -10,7 +10,7 @@
     @cvs-id $Id$
 } {
 
-    survey_id:integer
+    survey_id:naturalnum,notnull
 
 }
 
Index: openacs-4/packages/survey/www/admin/response-limit-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/response-limit-toggle.tcl,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/survey/www/admin/response-limit-toggle.tcl	6 Nov 2013 07:33:55 -0000	1.3
+++ openacs-4/packages/survey/www/admin/response-limit-toggle.tcl	7 Aug 2014 07:11:48 -0000	1.3.2.1
@@ -9,7 +9,7 @@
 
 } {
 
-    survey_id:integer
+    survey_id:naturalnum,notnull
 
 }
 
Index: openacs-4/packages/survey/www/admin/responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/survey/www/admin/responses.tcl	6 Nov 2013 07:33:55 -0000	1.6
+++ openacs-4/packages/survey/www/admin/responses.tcl	7 Aug 2014 07:11:48 -0000	1.6.2.1
@@ -11,7 +11,7 @@
     @cvs-id  $Id$
 } {
 
-    survey_id:integer
+    survey_id:naturalnum,notnull
 
 }
 
Index: openacs-4/packages/survey/www/admin/send-mail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/send-mail.tcl,v
diff -u -N -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/survey/www/admin/send-mail.tcl	29 Jul 2014 11:42:13 -0000	1.6.2.1
+++ openacs-4/packages/survey/www/admin/send-mail.tcl	7 Aug 2014 07:11:48 -0000	1.6.2.2
@@ -10,7 +10,7 @@
     @cvs-id $Id:
 } {
   survey_id:naturalnum,notnull
-  {package_id:integer 0}
+  {package_id:naturalnum,notnull 0}
   {to "responded"}  
 }
 
Index: openacs-4/packages/survey/www/admin/survey-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-delete.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/survey/www/admin/survey-delete.tcl	6 Nov 2013 07:33:55 -0000	1.5
+++ openacs-4/packages/survey/www/admin/survey-delete.tcl	7 Aug 2014 07:11:48 -0000	1.5.2.1
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 } {
 
-   survey_id:integer
+   survey_id:naturalnum,notnull
 
 }
 
Index: openacs-4/packages/survey/www/admin/survey-display-type-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-display-type-edit.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/survey/www/admin/survey-display-type-edit.tcl	6 Nov 2013 07:33:55 -0000	1.2
+++ openacs-4/packages/survey/www/admin/survey-display-type-edit.tcl	7 Aug 2014 07:11:48 -0000	1.2.2.1
@@ -6,7 +6,7 @@
     @cvs-id response-limit-toggle.tcl,v 1.2.2.6 2000/07/21 04:04:21 ron Exp
 
 } {
-    survey_id:integer
+    survey_id:naturalnum,notnull
     display_type:notnull
 }
 
Index: openacs-4/packages/survey/www/admin/survey-preview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-preview.tcl,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/survey/www/admin/survey-preview.tcl	29 Jul 2014 11:42:13 -0000	1.5.2.1
+++ openacs-4/packages/survey/www/admin/survey-preview.tcl	7 Aug 2014 07:11:48 -0000	1.5.2.2
@@ -12,7 +12,7 @@
 } {
     
     survey_id:naturalnum,notnull
-    {section_id:integer ""}
+    {section_id:naturalnum ""}
     return_url:optional
 
 } -validate {
Index: openacs-4/packages/survey/www/admin/survey-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-toggle.tcl,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/survey/www/admin/survey-toggle.tcl	6 Nov 2013 07:33:55 -0000	1.3
+++ openacs-4/packages/survey/www/admin/survey-toggle.tcl	7 Aug 2014 07:11:48 -0000	1.3.2.1
@@ -10,7 +10,7 @@
     @date   February 9, 2000
     @cvs-id $Id$
 } {
-    survey_id:integer
+    survey_id:naturalnum,notnull
     enabled_p
     {target "./"}
 }
Index: openacs-4/packages/survey/www/admin/user-responses-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/user-responses-delete.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/survey/www/admin/user-responses-delete.tcl	6 Nov 2013 07:33:55 -0000	1.5
+++ openacs-4/packages/survey/www/admin/user-responses-delete.tcl	7 Aug 2014 07:11:48 -0000	1.5.2.1
@@ -8,8 +8,8 @@
     @date   August 7, 2002
     @cvs-id $Id$
 } {
-    survey_id:integer
-    user_id:integer
+    survey_id:naturalnum,notnull
+    user_id:naturalnum,notnull
 }
 
 set package_id [ad_conn package_id]