Document "trim" settings in config text

diff --git a/examples/etc/pgwui.ini b/examples/etc/pgwui.ini
index 8c1dab738dab2fff05b519b7ad9d79ca31e05d12..1dae897a1b965b2fd1b8cbdc482fff0845a287b3 100644 (file)
--- a/examples/etc/pgwui.ini
+++ b/examples/etc/pgwui.ini
@@ -209,6 +209,12 @@ pgwui.dry_run = False
 
 # pgwui_upload
 
+#pgwui.pgwui_upload =
+#    literal_column_headings = off
+#    menu_label = upload -- Upload File Into Database
+#    trim = choice-yes
+#
+# literal_column_headings
 # Take uploaded column headings literally?
 # The available choices are:
 #   on   The file's column headings, as typed, are the table's column names.
@@ -218,21 +224,33 @@ pgwui.dry_run = False
 #
 # Caution: Non-ASCII column names, particularly in the Turkish locale,
 # are not guaranteed to be case-insensitive.
-#pgwui.pgwui_upload =
-#    literal_column_headings = off
-#    # menu_label = upload -- Upload File Into Database
+#
+# trim
+# Whether or not to remove leading and trailing whitespace from each
+# uploaded data element.  (From each "cell", each column of each row.)
+#
+# The available choices are:
+#   yes-always    Always trim.
+#   choice-yes    Present a checkbox, default to "yes, trim".
+#   choice-no     Present a checkbox, default to "no, don't trim".
+#   no-never      Never trim.
 
 
 # pgwui_bulk_upload
 
-#pgwui.pgwui_upload =
+#pgwui.pgwui_bulk_upload =
 #    literal_column_headings = off
-#    #   Take uploaded column headings literally?
-#    #   See pgwui_upload above for details.
-#    # menu_label = upload -- Upload File Into Database
+#    menu_label = bulk_upload -- Upload Many Files Into PostgreSQL
 #    map_file = contents.yml
-#    #   Name of the file in the zip file that maps file names to table
-#    #   names.  The default name of the map file is `contents.yml`.
+#    trim = choice-yes
+#
+# literal_column_headings = off
+#   Take uploaded column headings literally?
+#   See pgwui_upload above for details.
+#
+# map_file
+#   Name of the file in the zip file that maps file names to table
+#   names.  The default name of the map file is `contents.yml`.
 #
 #   The map file is in YAML syntax, which for purposes of this document
 #   can be thought of as a superset of JSON.  It must contain a top-level
@@ -264,10 +282,10 @@ pgwui.dry_run = False
 #
 #   It is recommended to enclose file names which contain spaces, or begin
 #   with a digit, in single quotes.  But any YAML syntax is valid.
-
-#pgwui.pgwui_bulk_upload =
-#    literal_column_headings = off
-#    map_file = contents.txt
+#
+# trim = choice-yes
+#   Remove leading and trailing whitespace.
+#   See pgwui_upload above for details.
 
 
 #

diff --git a/examples/misc/development.ini b/examples/misc/development.ini
index 8851fc54ed81e0498eb3232d743738e15db63d97..b976446cc6be6058ce81b1ca2a474042ca232254 100644 (file)
--- a/examples/misc/development.ini
+++ b/examples/misc/development.ini
@@ -211,8 +211,15 @@ pgwui.validate_hmac = False
 #    order = pgwui_upload
 #            pgwui_logout
 
+
 # pgwui_upload
 
+#pgwui.pgwui_upload =
+#    literal_column_headings = off
+#    menu_label = upload -- Upload File Into Database
+#    trim = choice-yes
+#
+# literal_column_headings
 # Take uploaded column headings literally?
 # The available choices are:
 #   on   The file's column headings, as typed, are the table's column names.
@@ -222,21 +229,33 @@ pgwui.validate_hmac = False
 #
 # Caution: Non-ASCII column names, particularly in the Turkish locale,
 # are not guaranteed to be case-insensitive.
-#pgwui.pgwui_upload =
-#    literal_column_headings = off
-#    # menu_label = upload -- Upload File Into Database
+#
+# trim
+# Whether or not to remove leading and trailing whitespace from each
+# uploaded data element.  (From each "cell", each column of each row.)
+#
+# The available choices are:
+#   yes-always    Always trim.
+#   choice-yes    Present a checkbox, default to "yes, trim".
+#   choice-no     Present a checkbox, default to "no, don't trim".
+#   no-never      Never trim.
 
 
 # pgwui_bulk_upload
 
-#pgwui.pgwui_upload =
+#pgwui.pgwui_bulk_upload =
 #    literal_column_headings = off
-#    #   Take uploaded column headings literally?
-#    #   See pgwui_upload above for details.
-#    # menu_label = upload -- Upload File Into Database
+#    menu_label = bulk_upload -- Upload Many Files Into PostgreSQL
 #    map_file = contents.yml
-#    #   Name of the file in the zip file that maps file names to table
-#    #   names.  The default name of the map file is `contents.yml`.
+#    trim = choice-yes
+#
+# literal_column_headings = off
+#   Take uploaded column headings literally?
+#   See pgwui_upload above for details.
+#
+# map_file
+#   Name of the file in the zip file that maps file names to table
+#   names.  The default name of the map file is `contents.yml`.
 #
 #   The map file is in YAML syntax, which for purposes of this document
 #   can be thought of as a superset of JSON.  It must contain a top-level
@@ -268,10 +287,10 @@ pgwui.validate_hmac = False
 #
 #   It is recommended to enclose file names which contain spaces, or begin
 #   with a digit, in single quotes.  But any YAML syntax is valid.
-
-#pgwui.pgwui_bulk_upload =
-#    literal_column_headings = off
-#    map_file = contents.txt
+#
+# trim = choice-yes
+#   Remove leading and trailing whitespace.
+#   See pgwui_upload above for details.
 
 
 #