Index: openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl,v
diff -u -N -r1.4 -r1.4.20.1
--- openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl	22 Dec 2003 22:00:25 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/applications/application-delete.tcl	29 Jul 2014 11:37:28 -0000	1.4.20.1
@@ -5,7 +5,7 @@
     @creation-date 2003-05-28
     @cvs-id $Id$
 } {
-    node_id:integer,multiple
+    node_id:naturalnum,multiple
     {confirm_p 0}
 }
 
Index: openacs-4/packages/acs-subsite/www/members/member-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/member-remove.tcl,v
diff -u -N -r1.3 -r1.3.20.1
--- openacs-4/packages/acs-subsite/www/members/member-remove.tcl	26 Jan 2004 15:39:46 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/members/member-remove.tcl	29 Jul 2014 11:37:29 -0000	1.3.20.1
@@ -5,7 +5,7 @@
     @creation-date 2003-06-02
     @cvs-id $Id$
 } {
-    user_id:integer,multiple
+    user_id:naturalnum,multiple
 }
 
 set group_id [application_group::group_id_from_package_id]
Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v
diff -u -N -r1.57.8.7 -r1.57.8.8
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	16 Oct 2013 19:56:15 -0000	1.57.8.7
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	29 Jul 2014 11:37:29 -0000	1.57.8.8
@@ -140,7 +140,7 @@
                            A form will be submitted to the url, containing a list of the key values of the checked rows.
                            For example, if 'key' is 'message_id', and rows with message_id 2 4 and 9 are chcked, the 
                            page will get variables message_id=2&message_id=4&message_id=9. The receiving page
-                           should declare message_id:integer,multiple in its ad_page_contract. Note that the 'message_id' 
+                           should declare message_id:naturalnum,multiple in its ad_page_contract. Note that the 'message_id' 
                            local variable will the be a Tcl list.
 
     @param  bulk_action_method should a bulk action be a "get" or "post"
Index: openacs-4/packages/attachments/www/download/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/download/index.vuh,v
diff -u -N -r1.1.22.1 -r1.1.22.2
--- openacs-4/packages/attachments/www/download/index.vuh	8 Sep 2013 08:11:58 -0000	1.1.22.1
+++ openacs-4/packages/attachments/www/download/index.vuh	29 Jul 2014 11:37:29 -0000	1.1.22.2
@@ -8,8 +8,8 @@
     @creation-date 2 July 2002
     @cvs-id $Id$
 } {
-    object_id:integer,notnull
-    attachment_id:integer,notnull
+    object_id:naturalnum,notnull
+    attachment_id:naturalnum,notnull
 }
 
 # Permission check
Index: openacs-4/packages/categories/www/cadmin/category-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete-2.tcl,v
diff -u -N -r1.9.4.1 -r1.9.4.2
--- openacs-4/packages/categories/www/cadmin/category-delete-2.tcl	29 Jul 2014 11:14:17 -0000	1.9.4.1
+++ openacs-4/packages/categories/www/cadmin/category-delete-2.tcl	29 Jul 2014 11:37:29 -0000	1.9.4.2
@@ -6,7 +6,7 @@
     @cvs-id $Id:
 } {
     tree_id:integer
-    category_id:integer,multiple
+    category_id:naturalnum,multiple
     {locale ""}
     object_id:naturalnum,optional
     ctx_id:naturalnum,optional
Index: openacs-4/packages/categories/www/cadmin/category-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.tcl,v
diff -u -N -r1.10.4.1 -r1.10.4.2
--- openacs-4/packages/categories/www/cadmin/category-delete.tcl	29 Jul 2014 11:14:17 -0000	1.10.4.1
+++ openacs-4/packages/categories/www/cadmin/category-delete.tcl	29 Jul 2014 11:37:29 -0000	1.10.4.2
@@ -6,7 +6,7 @@
     @cvs-id $Id:
 } {
     tree_id:integer
-    category_id:integer,multiple
+    category_id:naturalnum,multiple
     {locale ""}
     object_id:naturalnum,optional
     ctx_id:naturalnum,optional
Index: openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl,v
diff -u -N -r1.4.4.2 -r1.4.4.3
--- openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl	29 Jul 2014 11:24:01 -0000	1.4.4.2
+++ openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl	29 Jul 2014 11:37:29 -0000	1.4.4.3
@@ -5,7 +5,7 @@
     @author Timo Hentschel (timo@timohentschel.de)
     @cvs-id $Id:
 } {
-    link_category_id:integer,multiple
+    link_category_id:naturalnum,multiple
     category_id:naturalnum,notnull
     tree_id:naturalnum,notnull
     {locale ""}
Index: openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl,v
diff -u -N -r1.4.4.2 -r1.4.4.3
--- openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl	29 Jul 2014 11:24:01 -0000	1.4.4.2
+++ openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl	29 Jul 2014 11:37:29 -0000	1.4.4.3
@@ -5,7 +5,7 @@
     @author Timo Hentschel (timo@timohentschel.de)
     @cvs-id $Id:
 } {
-    link_category_id:integer,multiple
+    link_category_id:naturalnum,multiple
     category_id:naturalnum,notnull
     tree_id:naturalnum,notnull
     {locale ""}
Index: openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl,v
diff -u -N -r1.5.4.1 -r1.5.4.2
--- openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl	29 Jul 2014 11:14:17 -0000	1.5.4.1
+++ openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl	29 Jul 2014 11:37:29 -0000	1.5.4.2
@@ -5,7 +5,7 @@
     @author Timo Hentschel (timo@timohentschel.de)
     @cvs-id $Id:
 } {
-    link_id:integer,multiple
+    link_id:naturalnum,multiple
     category_id:integer
     tree_id:integer
     {locale ""}
Index: openacs-4/packages/categories/www/cadmin/category-link-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete.tcl,v
diff -u -N -r1.6.4.1 -r1.6.4.2
--- openacs-4/packages/categories/www/cadmin/category-link-delete.tcl	29 Jul 2014 11:14:17 -0000	1.6.4.1
+++ openacs-4/packages/categories/www/cadmin/category-link-delete.tcl	29 Jul 2014 11:37:29 -0000	1.6.4.2
@@ -5,7 +5,7 @@
     @author Timo Hentschel (timo@timohentschel.de)
     @cvs-id $Id:
 } {
-    link_id:integer,multiple
+    link_id:naturalnum,multiple
     category_id:integer
     tree_id:integer
     {locale ""}
Index: openacs-4/packages/categories/www/cadmin/category-phase-in.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-phase-in.tcl,v
diff -u -N -r1.5.4.1 -r1.5.4.2
--- openacs-4/packages/categories/www/cadmin/category-phase-in.tcl	29 Jul 2014 11:14:18 -0000	1.5.4.1
+++ openacs-4/packages/categories/www/cadmin/category-phase-in.tcl	29 Jul 2014 11:37:29 -0000	1.5.4.2
@@ -5,7 +5,7 @@
     @cvs-id $Id:
 } {
     tree_id:integer
-    category_id:integer,multiple
+    category_id:naturalnum,multiple
     {locale ""}
     object_id:naturalnum,optional
     ctx_id:naturalnum,optional
Index: openacs-4/packages/categories/www/cadmin/category-phase-out.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-phase-out.tcl,v
diff -u -N -r1.6.4.1 -r1.6.4.2
--- openacs-4/packages/categories/www/cadmin/category-phase-out.tcl	29 Jul 2014 11:14:18 -0000	1.6.4.1
+++ openacs-4/packages/categories/www/cadmin/category-phase-out.tcl	29 Jul 2014 11:37:29 -0000	1.6.4.2
@@ -5,7 +5,7 @@
     @cvs-id $Id:
 } {
     tree_id:integer
-    category_id:integer,multiple
+    category_id:naturalnum,multiple
     {locale ""}
     object_id:naturalnum,optional
     ctx_id:naturalnum,optional
Index: openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl,v
diff -u -N -r1.3.4.2 -r1.3.4.3
--- openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl	29 Jul 2014 11:24:01 -0000	1.3.4.2
+++ openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl	29 Jul 2014 11:37:29 -0000	1.3.4.3
@@ -5,7 +5,7 @@
     @author Timo Hentschel (timo@timohentschel.de)
     @cvs-id $Id:
 } {
-    synonym_id:integer,multiple
+    synonym_id:naturalnum,multiple
     category_id:naturalnum,notnull
     tree_id:naturalnum,notnull
     {locale ""}
Index: openacs-4/packages/categories/www/cadmin/synonym-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete.tcl,v
diff -u -N -r1.3.4.2 -r1.3.4.3
--- openacs-4/packages/categories/www/cadmin/synonym-delete.tcl	29 Jul 2014 11:24:01 -0000	1.3.4.2
+++ openacs-4/packages/categories/www/cadmin/synonym-delete.tcl	29 Jul 2014 11:37:29 -0000	1.3.4.3
@@ -5,7 +5,7 @@
     @author Timo Hentschel (timo@timohentschel.de)
     @cvs-id $Id:
 } {
-    synonym_id:integer,multiple
+    synonym_id:naturalnum,multiple
     category_id:naturalnum,notnull
     tree_id:naturalnum,notnull
     {locale ""}
Index: openacs-4/packages/file-storage/www/download/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download/index.vuh,v
diff -u -N -r1.10.4.2 -r1.10.4.3
--- openacs-4/packages/file-storage/www/download/index.vuh	8 Sep 2013 08:11:58 -0000	1.10.4.2
+++ openacs-4/packages/file-storage/www/download/index.vuh	29 Jul 2014 11:37:29 -0000	1.10.4.3
@@ -9,8 +9,8 @@
     @creation-date 18 December 2000
     @cvs-id $Id$
 } {
-    file_id:integer,optional
-    version_id:integer,optional
+    file_id:naturalnum,optional
+    version_id:naturalnum,optional
 } -validate {
     either_one {
 	if { ! [info exists file_id] && ! [info exists version_id] } {
Index: openacs-4/packages/file-storage/www/download-archive/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download-archive/index.vuh,v
diff -u -N -r1.5.8.1 -r1.5.8.2
--- openacs-4/packages/file-storage/www/download-archive/index.vuh	8 Sep 2013 08:11:58 -0000	1.5.8.1
+++ openacs-4/packages/file-storage/www/download-archive/index.vuh	29 Jul 2014 11:37:29 -0000	1.5.8.2
@@ -7,7 +7,7 @@
     @version $Id$
 
 } -query {
-    {object_id:integer,optional}
+    {object_id:naturalnum,optional}
 }
 
 if {([info exists object_id] && $object_id ne "")} {
Index: openacs-4/packages/oacs-dav/www/admin/disable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/www/admin/disable.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.1.16.1
--- openacs-4/packages/oacs-dav/www/admin/disable.tcl	16 Feb 2004 16:49:28 -0000	1.1.1.1
+++ openacs-4/packages/oacs-dav/www/admin/disable.tcl	29 Jul 2014 11:37:30 -0000	1.1.1.1.16.1
@@ -8,7 +8,7 @@
     @creation-date 2004-02-15
     @cvs-id $Id$
 } {
-    folder_id:integer,multiple
+    folder_id:naturalnum,multiple
 } -properties {
 } -validate {
 } -errors {
Index: openacs-4/packages/oacs-dav/www/admin/enable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/www/admin/enable.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.1.16.1
--- openacs-4/packages/oacs-dav/www/admin/enable.tcl	16 Feb 2004 16:49:28 -0000	1.1.1.1
+++ openacs-4/packages/oacs-dav/www/admin/enable.tcl	29 Jul 2014 11:37:30 -0000	1.1.1.1.16.1
@@ -8,7 +8,7 @@
     @creation-date 2004-02-15
     @cvs-id $Id$
 } {
-    folder_id:integer,multiple
+    folder_id:naturalnum,multiple
 } -properties {
 } -validate {
 } -errors {
Index: openacs-4/packages/survey/www/one-survey.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-survey.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/survey/www/one-survey.tcl	6 Nov 2013 07:33:54 -0000	1.4
+++ openacs-4/packages/survey/www/one-survey.tcl	29 Jul 2014 11:42:12 -0000	1.4.2.1
@@ -8,7 +8,7 @@
     @date    28th September 2000
     @cvs-id  $Id$
 } {
-    survey_id:integer,notnull
+    survey_id:naturalnum,notnull
 } -properties {
     survey_details:multirow
 }
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 -r1.9.2.1
--- openacs-4/packages/survey/www/respond.tcl	6 Nov 2013 07:33:54 -0000	1.9
+++ openacs-4/packages/survey/www/respond.tcl	29 Jul 2014 11:42:12 -0000	1.9.2.1
@@ -11,7 +11,7 @@
 
 } {
     
-    survey_id:integer,notnull
+    survey_id:naturalnum,notnull
     {section_id:integer 0}
     {response_id:integer 0}
     return_url:optional
Index: openacs-4/packages/survey/www/view-attachment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/view-attachment.tcl,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/survey/www/view-attachment.tcl	6 Nov 2013 07:33:54 -0000	1.3
+++ openacs-4/packages/survey/www/view-attachment.tcl	29 Jul 2014 11:42:12 -0000	1.3.2.1
@@ -13,8 +13,8 @@
   @cvs-id $Id$
 } {
 
-  response_id:integer,notnull
-  question_id:integer,notnull
+  response_id:naturalnum,notnull
+  question_id:naturalnum,notnull
 
 } -validate {
     attachment_exists -requires {response_id question_id} {
Index: openacs-4/packages/survey/www/admin/modify-responses-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/modify-responses-2.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/survey/www/admin/modify-responses-2.tcl	6 Nov 2013 07:33:54 -0000	1.2
+++ openacs-4/packages/survey/www/admin/modify-responses-2.tcl	29 Jul 2014 11:42:12 -0000	1.2.2.1
@@ -10,8 +10,8 @@
     @date   September 15, 2000
     @cvs-id $Id$
 } {
-    section_id:integer,notnull
-    question_id:integer,notnull
+    section_id:naturalnum,notnull
+    question_id:naturalnum,notnull
     {responses:multiple ""}
     {scores:multiple,array,integer ""}
     {variable_id_list ""}
Index: openacs-4/packages/survey/www/admin/question-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-add-3.tcl,v
diff -u -N -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/survey/www/admin/question-add-3.tcl	8 Apr 2014 08:06:39 -0000	1.6.2.1
+++ openacs-4/packages/survey/www/admin/question-add-3.tcl	29 Jul 2014 11:42:12 -0000	1.6.2.2
@@ -19,8 +19,8 @@
     @author nstrug@arsdigita.com
     @cvs-id $Id$
 } {
-    section_id:integer,notnull
-    question_id:integer,notnull
+    section_id:naturalnum,notnull
+    question_id:naturalnum,notnull
     after:integer,optional
     question_text:html
     {abstract_data_type ""}
Index: openacs-4/packages/survey/www/admin/question-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-copy.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/survey/www/admin/question-copy.tcl	6 Nov 2013 07:33:54 -0000	1.2
+++ openacs-4/packages/survey/www/admin/question-copy.tcl	29 Jul 2014 11:42:12 -0000	1.2.2.1
@@ -4,7 +4,7 @@
     @date    July 29, 2002
     @cvs-id $Id:
 } {
-    question_id:integer,notnull
+    question_id:naturalnum,notnull
     {sort_order 0}
 }
 
Index: openacs-4/packages/survey/www/admin/question-swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-swap.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/survey/www/admin/question-swap.tcl	6 Nov 2013 07:33:55 -0000	1.4
+++ openacs-4/packages/survey/www/admin/question-swap.tcl	29 Jul 2014 11:42:12 -0000	1.4.2.1
@@ -11,8 +11,8 @@
   @cvs-id $Id$
 
 } {
-  survey_id:integer,notnull
-  section_id:integer,notnull
+  survey_id:naturalnum,notnull
+  section_id:naturalnum,notnull
   sort_order:integer,notnull
   direction:notnull
 }
Index: openacs-4/packages/survey/www/admin/response-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/response-delete.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/survey/www/admin/response-delete.tcl	6 Nov 2013 07:33:55 -0000	1.4
+++ openacs-4/packages/survey/www/admin/response-delete.tcl	29 Jul 2014 11:42:12 -0000	1.4.2.1
@@ -8,7 +8,7 @@
     @date   August 7, 2002
     @cvs-id $Id$
 } {
-   response_id:integer,optional
+   response_id:naturalnum,optional
 }
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/survey/www/admin/response-drill-down.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/response-drill-down.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/survey/www/admin/response-drill-down.tcl	6 Nov 2013 07:33:55 -0000	1.4
+++ openacs-4/packages/survey/www/admin/response-drill-down.tcl	29 Jul 2014 11:42:12 -0000	1.4.2.1
@@ -15,8 +15,8 @@
 
 } {
 
-  question_id:integer,notnull
-  choice_id:integer,notnull
+  question_id:naturalnum,notnull
+  choice_id:naturalnum,notnull
   
 }
 
Index: openacs-4/packages/survey/www/admin/responses-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses-export.tcl,v
diff -u -N -r1.10 -r1.10.2.1
--- openacs-4/packages/survey/www/admin/responses-export.tcl	6 Nov 2013 07:33:55 -0000	1.10
+++ openacs-4/packages/survey/www/admin/responses-export.tcl	29 Jul 2014 11:42:13 -0000	1.10.2.1
@@ -9,9 +9,9 @@
 
 } {
 
-  survey_id:integer,notnull
+  survey_id:naturalnum,notnull
   {unique_users_p f}
-  on_what_id:optional,integer
+  on_what_id:naturalnum,optional
   {start:naturalnum 1}
   {end:naturalnum 10000}
 }
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 -r1.6.2.1
--- openacs-4/packages/survey/www/admin/send-mail.tcl	6 Nov 2013 07:33:55 -0000	1.6
+++ openacs-4/packages/survey/www/admin/send-mail.tcl	29 Jul 2014 11:42:13 -0000	1.6.2.1
@@ -9,7 +9,7 @@
     @date   July 29, 2002
     @cvs-id $Id:
 } {
-  survey_id:integer,notnull
+  survey_id:naturalnum,notnull
   {package_id:integer 0}
   {to "responded"}  
 }
Index: openacs-4/packages/survey/www/admin/survey-category-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-category-add.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/survey/www/admin/survey-category-add.tcl	6 Nov 2013 07:33:55 -0000	1.2
+++ openacs-4/packages/survey/www/admin/survey-category-add.tcl	29 Jul 2014 11:42:13 -0000	1.2.2.1
@@ -10,7 +10,7 @@
     @cvs-id survey-category-add.tcl,v 1.4.2.4 2000/07/21 04:04:22 ron Exp
 } {
 
-    section_id:integer,notnull
+    section_id:naturalnum,notnull
     category:notnull
 
 }
Index: openacs-4/packages/survey/www/admin/survey-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-copy.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/survey/www/admin/survey-copy.tcl	6 Nov 2013 07:33:55 -0000	1.5
+++ openacs-4/packages/survey/www/admin/survey-copy.tcl	29 Jul 2014 11:42:13 -0000	1.5.2.1
@@ -4,9 +4,9 @@
     @date    August 3, 2002
     @cvs-id $Id:
 } {
-    survey_id:integer,notnull
+    survey_id:naturalnum,notnull
     name:optional
-    new_survey_id:optional
+    new_survey_id:naturalnum,optional
 }
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/survey/www/admin/survey-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-create.tcl,v
diff -u -N -r1.8 -r1.8.2.1
--- openacs-4/packages/survey/www/admin/survey-create.tcl	6 Nov 2013 07:33:55 -0000	1.8
+++ openacs-4/packages/survey/www/admin/survey-create.tcl	29 Jul 2014 11:42:13 -0000	1.8.2.1
@@ -12,7 +12,7 @@
   @cvs-id $Id$
 
 } {
-    survey_id:optional
+    survey_id:naturalnum,optional
     {name ""}
     {description:html ""}
     {variable_names ""}
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 -r1.5.2.1
--- openacs-4/packages/survey/www/admin/survey-preview.tcl	6 Nov 2013 07:33:55 -0000	1.5
+++ openacs-4/packages/survey/www/admin/survey-preview.tcl	29 Jul 2014 11:42:13 -0000	1.5.2.1
@@ -11,7 +11,7 @@
 
 } {
     
-    survey_id:integer,notnull
+    survey_id:naturalnum,notnull
     {section_id:integer ""}
     return_url:optional
 
Index: openacs-4/packages/survey/www/admin/view-text-responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/view-text-responses.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/survey/www/admin/view-text-responses.tcl	6 Nov 2013 07:33:55 -0000	1.4
+++ openacs-4/packages/survey/www/admin/view-text-responses.tcl	29 Jul 2014 11:42:13 -0000	1.4.2.1
@@ -11,7 +11,7 @@
 
 } {
 
-  question_id:integer,notnull
+  question_id:naturalnum,notnull
 
 }