From: Kevin C. <ke...@us...> - 2005-11-07 10:16:58
|
Update of /cvsroot/mailmanager/mailmanager/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20467 Modified Files: addAttachment.zsql addCategory.zsql addCategoryChoice.zsql addCustomer.zsql addCustomerEmail.zsql addFilter.zsql addGroup.zsql addGroupMember.zsql addGroupSeq.zsql addHistory.zsql addMessage.zsql addTemplate.zsql addTicket.zsql addUser.zsql Log Message: Converting to sqv_ name mangling Index: addMessage.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addMessage.zsql,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- addMessage.zsql 14 Sep 2005 13:20:44 -0000 1.6 +++ addMessage.zsql 7 Nov 2005 10:16:49 -0000 1.7 @@ -2,7 +2,7 @@ title:Add a new message connection_id: mailmanager_db max_rows:0 -arguments:id ticket_id message_id from_name from_email subject msg_date msg_to cc bcc reply_to raw_headers body html_body +arguments:sqv_id sqv_ticket_id sqv_message_id sqv_from_name sqv_from_email sqv_subject sqv_msg_date sqv_msg_to sqv_cc sqv_bcc sqv_reply_to sqv_raw_headers sqv_body sqv_html_body </dtml-comment> <dtml-if expr="sql_database == 'mysql'"> @@ -15,24 +15,24 @@ from_email, subject, msg_date, msg_to, cc, bcc, reply_to, raw_headers, body, html_body) -VALUES (<dtml-sqlvar id type="int">, - <dtml-sqlvar ticket_id type="int">, - <dtml-sqlvar message_id type="string">, - <dtml-sqlvar from_name type="string">, - <dtml-sqlvar from_email type="string">, - <dtml-sqlvar subject type="string">, - <dtml-if msg_date> - <dtml-sqlvar msg_date type="nb">, +VALUES (<dtml-sqlvar sqv_id type="int">, + <dtml-sqlvar sqv_ticket_id type="int">, + <dtml-sqlvar sqv_message_id type="string">, + <dtml-sqlvar sqv_from_name type="string">, + <dtml-sqlvar sqv_from_email type="string">, + <dtml-sqlvar sqv_subject type="string">, + <dtml-if sqv_msg_date> + <dtml-sqlvar sqv_msg_date type="nb">, <dtml-else> NOW(), </dtml-if> - <dtml-sqlvar msg_to type="string">, - <dtml-sqlvar cc type="string">, - <dtml-sqlvar bcc type="string">, - <dtml-sqlvar reply_to type="string">, - <dtml-sqlvar raw_headers type="string">, - <dtml-sqlvar body type="string">, - <dtml-sqlvar html_body type="string">) <dtml-var sql_delimiter> + <dtml-sqlvar sqv_msg_to type="string">, + <dtml-sqlvar sqv_cc type="string">, + <dtml-sqlvar sqv_bcc type="string">, + <dtml-sqlvar sqv_reply_to type="string">, + <dtml-sqlvar sqv_raw_headers type="string">, + <dtml-sqlvar sqv_body type="string">, + <dtml-sqlvar sqv_html_body type="string">) <dtml-var sql_delimiter> <dtml-if expr="sql_database == 'mysql'"> @@ -40,23 +40,23 @@ INSERT INTO mm_message_index ( id, ticket_id, body, html_body ) VALUES ( - <dtml-sqlvar id type="int">, - <dtml-sqlvar ticket_id type="int">, - <dtml-sqlvar body type="string">, - <dtml-sqlvar html_body type="string"> + <dtml-sqlvar sqv_id type="int">, + <dtml-sqlvar sqv_ticket_id type="int">, + <dtml-sqlvar sqv_body type="string">, + <dtml-sqlvar sqv_html_body type="string"> ) <dtml-var sql_delimiter> UPDATE mm_ticket_index SET body = ( SELECT GROUP_CONCAT(body) FROM mm_message_index - WHERE ticket_id = <dtml-sqlvar ticket_id type="int"> + WHERE ticket_id = <dtml-sqlvar sqv_ticket_id type="int"> ), html_body = ( SELECT GROUP_CONCAT(html_body) FROM mm_message_index - WHERE ticket_id = <dtml-sqlvar ticket_id type="int"> + WHERE ticket_id = <dtml-sqlvar sqv_ticket_id type="int"> ) - WHERE id = <dtml-sqlvar ticket_id type="int"> + WHERE id = <dtml-sqlvar sqv_ticket_id type="int"> </dtml-if> Index: addUser.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addUser.zsql,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- addUser.zsql 11 Aug 2005 16:28:39 -0000 1.5 +++ addUser.zsql 7 Nov 2005 10:16:49 -0000 1.6 @@ -2,15 +2,15 @@ title:Add a new user connection_id: mailmanager_db max_rows:0 -arguments:username real_name email signature tickets reports settings password +arguments:sqv_username sqv_real_name sqv_email sqv_signature sqv_tickets sqv_reports sqv_settings sqv_password </dtml-comment> INSERT INTO <dtml-var schema>mm_user (username, real_name, email, signature, tickets, reports, settings, password) -VALUES (<dtml-sqlvar username type="nb">, - <dtml-sqlvar real_name type="nb">, - <dtml-sqlvar email type="nb">, - <dtml-sqlvar signature type="string">, - <dtml-sqlvar tickets type="nb">, - <dtml-sqlvar reports type="nb">, - <dtml-sqlvar settings type="nb">, - <dtml-sqlvar password type="nb">) +VALUES (<dtml-sqlvar sqv_username type="nb">, + <dtml-sqlvar sqv_real_name type="nb">, + <dtml-sqlvar sqv_email type="nb">, + <dtml-sqlvar sqv_signature type="string">, + <dtml-sqlvar sqv_tickets type="nb">, + <dtml-sqlvar sqv_reports type="nb">, + <dtml-sqlvar sqv_settings type="nb">, + <dtml-sqlvar sqv_password type="nb">) Index: addGroupSeq.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addGroupSeq.zsql,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- addGroupSeq.zsql 11 Aug 2005 16:28:39 -0000 1.3 +++ addGroupSeq.zsql 7 Nov 2005 10:16:49 -0000 1.4 @@ -2,7 +2,7 @@ title:Add a sequence for cycling through a group (Postgres) connection_id: mailmanager_db max_rows:0 -arguments:group_id group_size +arguments:sqv_group_id sqv_group_size </dtml-comment> -CREATE SEQUENCE <dtml-var schema>group_<dtml-var group_id>_seq -MAXVALUE <dtml-var group_size> CYCLE +CREATE SEQUENCE <dtml-var schema>group_<dtml-var sqv_group_id>_seq +MAXVALUE <dtml-var sqv_group_size> CYCLE Index: addCustomerEmail.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addCustomerEmail.zsql,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- addCustomerEmail.zsql 11 Aug 2005 16:28:39 -0000 1.3 +++ addCustomerEmail.zsql 7 Nov 2005 10:16:49 -0000 1.4 @@ -2,8 +2,8 @@ title:Add an email that a customer can access connection_id: mailmanager_db max_rows:0 -arguments:username access_email +arguments:sqv_username sqv_access_email </dtml-comment> INSERT INTO <dtml-var schema>mm_customer_email (username, access_email) -VALUES (<dtml-sqlvar username type="nb">, - <dtml-sqlvar access_email type="nb">) +VALUES (<dtml-sqlvar sqv_username type="nb">, + <dtml-sqlvar sqv_access_email type="nb">) Index: addHistory.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addHistory.zsql,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- addHistory.zsql 11 Aug 2005 16:28:39 -0000 1.3 +++ addHistory.zsql 7 Nov 2005 10:16:49 -0000 1.4 @@ -2,24 +2,24 @@ title:Add an entry to the history table connection_id: mailmanager_db max_rows:0 -arguments:ticket_id subject assigned status priority category0 category1 category2 support_of changed_by change_date +arguments:sqv_ticket_id sqv_subject sqv_assigned sqv_status sqv_priority sqv_category0 sqv_category1 sqv_category2 sqv_support_of sqv_changed_by sqv_change_date </dtml-comment> INSERT INTO <dtml-var schema>mm_history (ticket_id, subject, assigned, status, priority, category0, category1, category2, support_of, changed_by, change_date) -VALUES (<dtml-sqlvar ticket_id type="int">, - <dtml-sqlvar subject type="nb" optional>, - <dtml-sqlvar assigned type="nb" optional>, - <dtml-sqlvar status type="nb" optional>, - <dtml-sqlvar priority type="int" optional>, - <dtml-sqlvar category0 type="nb" optional>, - <dtml-sqlvar category1 type="nb" optional>, - <dtml-sqlvar category2 type="nb" optional>, - <dtml-sqlvar support_of type="int" optional>, - <dtml-sqlvar changed_by type="string"> - <dtml-if change_date> - , <dtml-sqlvar change_date type="string"> +VALUES (<dtml-sqlvar sqv_ticket_id type="int">, + <dtml-sqlvar sqv_subject type="nb" optional>, + <dtml-sqlvar sqv_assigned type="nb" optional>, + <dtml-sqlvar sqv_status type="nb" optional>, + <dtml-sqlvar sqv_priority type="int" optional>, + <dtml-sqlvar sqv_category0 type="nb" optional>, + <dtml-sqlvar sqv_category1 type="nb" optional>, + <dtml-sqlvar sqv_category2 type="nb" optional>, + <dtml-sqlvar sqv_support_of type="int" optional>, + <dtml-sqlvar sqv_changed_by type="string"> + <dtml-if sqv_change_date> + , <dtml-sqlvar sqv_change_date type="string"> <dtml-else> , NOW() </dtml-if>) Index: addFilter.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addFilter.zsql,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- addFilter.zsql 11 Aug 2005 16:28:39 -0000 1.4 +++ addFilter.zsql 7 Nov 2005 10:16:49 -0000 1.5 @@ -2,20 +2,20 @@ title:Add a new filter connection_id: mailmanager_db max_rows:0 -arguments:header_name header_operator header_value status assign_user assign_group priority category0 category1 category2 response_target +arguments:sqv_header_name sqv_header_operator sqv_header_value sqv_status sqv_assign_user sqv_assign_group sqv_priority sqv_category0 sqv_category1 sqv_category2 sqv_response_target </dtml-comment> INSERT INTO <dtml-var schema>mm_filter (status, assign_user, assign_group, priority, category0, category1, category2, response_target, header_name, header_operator, header_value) -VALUES (<dtml-sqlvar status type="nb" optional>, - <dtml-sqlvar assign_user type="nb" optional>, - <dtml-sqlvar assign_group type="nb" optional>, - <dtml-sqlvar priority type="int" optional>, - <dtml-sqlvar category0 type="nb" optional>, - <dtml-sqlvar category1 type="nb" optional>, - <dtml-sqlvar category2 type="nb" optional>, - <dtml-sqlvar response_target type="int" optional>, - <dtml-sqlvar header_name type="nb">, - <dtml-sqlvar header_operator type="nb">, - <dtml-sqlvar header_value type="nb">) +VALUES (<dtml-sqlvar sqv_status type="nb" optional>, + <dtml-sqlvar sqv_assign_user type="nb" optional>, + <dtml-sqlvar sqv_assign_group type="nb" optional>, + <dtml-sqlvar sqv_priority type="int" optional>, + <dtml-sqlvar sqv_category0 type="nb" optional>, + <dtml-sqlvar sqv_category1 type="nb" optional>, + <dtml-sqlvar sqv_category2 type="nb" optional>, + <dtml-sqlvar sqv_response_target type="int" optional>, + <dtml-sqlvar sqv_header_name type="nb">, + <dtml-sqlvar sqv_header_operator type="nb">, + <dtml-sqlvar sqv_header_value type="nb">) Index: addCategory.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addCategory.zsql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- addCategory.zsql 14 Sep 2005 13:20:44 -0000 1.2 +++ addCategory.zsql 7 Nov 2005 10:16:49 -0000 1.3 @@ -1,9 +1,9 @@ <dtml-comment> title:Add a category connection_id:mailmanager_db -arguments: id label enabled +arguments:sqv_id sqv_label sqv_enabled </dtml-comment> INSERT INTO <dtml-var schema>mm_categories (id, label, enabled) -VALUES (<dtml-sqlvar id type="int">, - <dtml-sqlvar label type="string">, - <dtml-sqlvar enabled type="nb">) +VALUES (<dtml-sqlvar sqv_id type="int">, + <dtml-sqlvar sqv_label type="string">, + <dtml-sqlvar sqv_enabled type="nb">) Index: addGroup.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addGroup.zsql,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- addGroup.zsql 11 Aug 2005 16:28:39 -0000 1.4 +++ addGroup.zsql 7 Nov 2005 10:16:49 -0000 1.5 @@ -2,7 +2,7 @@ title:Add a new group connection_id: mailmanager_db max_rows:0 -arguments:group_name +arguments:sqv_group_name </dtml-comment> INSERT INTO <dtml-var schema>mm_group (group_name) -VALUES (<dtml-sqlvar group_name type="nb">) +VALUES (<dtml-sqlvar sqv_group_name type="nb">) Index: addCustomer.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addCustomer.zsql,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- addCustomer.zsql 11 Aug 2005 16:28:39 -0000 1.3 +++ addCustomer.zsql 7 Nov 2005 10:16:49 -0000 1.4 @@ -2,9 +2,9 @@ title:Add a new customer connection_id: mailmanager_db max_rows:0 -arguments:username real_name password +arguments:sqv_username sqv_real_name sqv_password </dtml-comment> INSERT INTO <dtml-var schema>mm_customer (username, real_name, password) -VALUES (<dtml-sqlvar username type="nb">, - <dtml-sqlvar real_name type="string">, - <dtml-sqlvar password type="nb">) +VALUES (<dtml-sqlvar sqv_username type="nb">, + <dtml-sqlvar sqv_real_name type="string">, + <dtml-sqlvar sqv_password type="nb">) Index: addCategoryChoice.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addCategoryChoice.zsql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- addCategoryChoice.zsql 14 Sep 2005 13:20:44 -0000 1.2 +++ addCategoryChoice.zsql 7 Nov 2005 10:16:49 -0000 1.3 @@ -1,8 +1,8 @@ <dtml-comment> title:Add a choice to a category connection_id:mailmanager_db -arguments: category_id choice +arguments:sqv_category_id sqv_choice </dtml-comment> INSERT INTO <dtml-var schema>mm_category_choices (category_id, choice) -VALUES (<dtml-sqlvar category_id type="int">, - <dtml-sqlvar choice type="string">) +VALUES (<dtml-sqlvar sqv_category_id type="int">, + <dtml-sqlvar sqv_choice type="string">) Index: addGroupMember.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addGroupMember.zsql,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- addGroupMember.zsql 11 Aug 2005 16:28:39 -0000 1.4 +++ addGroupMember.zsql 7 Nov 2005 10:16:49 -0000 1.5 @@ -2,8 +2,8 @@ title:Add a new member to a group connection_id: mailmanager_db max_rows:0 -arguments:group_name username +arguments:sqv_group_name sqv_username </dtml-comment> INSERT INTO <dtml-var schema>mm_group_members (group_name, username) -VALUES (<dtml-sqlvar group_name type="nb">, - <dtml-sqlvar username type="nb">) +VALUES (<dtml-sqlvar sqv_group_name type="nb">, + <dtml-sqlvar sqv_username type="nb">) Index: addAttachment.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addAttachment.zsql,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- addAttachment.zsql 14 Sep 2005 13:20:44 -0000 1.6 +++ addAttachment.zsql 7 Nov 2005 10:16:49 -0000 1.7 @@ -2,17 +2,17 @@ title:Add a new attachment (Postgres) connection_id: mailmanager_db max_rows:0 -arguments:message_id title content_type is_file body dangerous +arguments:sqv_message_id sqv_title sqv_content_type sqv_is_file sqv_body sqv_dangerous </dtml-comment> INSERT INTO <dtml-var schema>mm_attachment (message_id, title, content_type, is_file, body, dangerous) -VALUES (<dtml-sqlvar message_id type="int">, - <dtml-sqlvar title type="string">, - <dtml-sqlvar content_type type="nb">, - <dtml-sqlvar is_file type="string">, +VALUES (<dtml-sqlvar sqv_message_id type="int">, + <dtml-sqlvar sqv_title type="string">, + <dtml-sqlvar sqv_content_type type="nb">, + <dtml-sqlvar sqv_is_file type="string">, <dtml-if expr="sql_database == 'postgres'"> - <dtml-var body>::bytea, + <dtml-var sqv_body>::bytea, <dtml-else> - <dtml-sqlvar body type="string">, + <dtml-sqlvar sqv_body type="string">, </dtml-if> - <dtml-sqlvar dangerous type="string">) + <dtml-sqlvar sqv_dangerous type="string">) Index: addTicket.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addTicket.zsql,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- addTicket.zsql 14 Sep 2005 13:20:44 -0000 1.6 +++ addTicket.zsql 7 Nov 2005 10:16:49 -0000 1.7 @@ -2,47 +2,47 @@ title:Add a new ticket connection_id: mailmanager_db max_rows:0 -arguments:id subject from_name from_email account_id assigned status priority category0 category1 category2 unread date_opened date_responded date_closed respond_by respond_by_interval support_of +arguments:sqv_sqv_id sqv_sqv_subject sqv_sqv_from_name sqv_sqv_from_email sqv_sqv_account_id sqv_sqv_assigned sqv_sqv_status sqv_sqv_priority sqv_sqv_category0 sqv_sqv_category1 sqv_sqv_category2 sqv_sqv_unread sqv_sqv_date_opened sqv_sqv_date_responded sqv_sqv_date_closed sqv_sqv_respond_by sqv_sqv_respond_by_interval sqv_sqv_support_of </dtml-comment> INSERT INTO <dtml-var schema>mm_ticket (id, subject, from_name, from_email, account_id, assigned, status, priority, category0, category1, category2, unread, respond_by, support_of, date_opened - <dtml-if date_responded>,date_responded</dtml-if> - <dtml-if date_closed>,date_closed</dtml-if> + <dtml-if sqv_date_responded>,date_responded</dtml-if> + <dtml-if sqv_date_closed>,date_closed</dtml-if> ) -VALUES (<dtml-sqlvar id type="int">, - <dtml-sqlvar subject type="string">, - <dtml-sqlvar from_name type="string">, - <dtml-sqlvar from_email type="string">, - <dtml-sqlvar account_id type="nb">, - <dtml-sqlvar assigned type="nb">, - <dtml-sqlvar status type="nb">, - <dtml-sqlvar priority type="int">, - <dtml-sqlvar category0 type="string">, - <dtml-sqlvar category1 type="string">, - <dtml-sqlvar category2 type="string">, - <dtml-sqlvar unread type="string">, - <dtml-if respond_by> - <dtml-sqlvar respond_by type="string"> - <dtml-elif respond_by_interval> +VALUES (<dtml-sqlvar sqv_id type="int">, + <dtml-sqlvar sqv_subject type="string">, + <dtml-sqlvar sqv_from_name type="string">, + <dtml-sqlvar sqv_from_email type="string">, + <dtml-sqlvar sqv_account_id type="nb">, + <dtml-sqlvar sqv_assigned type="nb">, + <dtml-sqlvar sqv_status type="nb">, + <dtml-sqlvar sqv_priority type="int">, + <dtml-sqlvar sqv_category0 type="string">, + <dtml-sqlvar sqv_category1 type="string">, + <dtml-sqlvar sqv_category2 type="string">, + <dtml-sqlvar sqv_unread type="string">, + <dtml-if sqv_respond_by> + <dtml-sqlvar sqv_respond_by type="string"> + <dtml-elif sqv_respond_by_interval> <dtml-if expr="sql_database == 'postgres'"> - (EXTRACT(EPOCH FROM CURRENT_TIMESTAMP)+<dtml-sqlvar respond_by_interval type="int">)::INTEGER::abstime::<dtml-var sql_datetimestamp> + (EXTRACT(EPOCH FROM CURRENT_TIMESTAMP)+<dtml-sqlvar sqv_respond_by_interval type="int">)::INTEGER::abstime::<dtml-var sqv_sql_datetimestamp> <dtml-elif expr="sql_database == 'mysql'"> - FROM_UNIXTIME(UNIX_TIMESTAMP(CURRENT_TIMESTAMP) + <dtml-sqlvar respond_by_interval type="int">) + FROM_UNIXTIME(UNIX_TIMESTAMP(CURRENT_TIMESTAMP) + <dtml-sqlvar sqv_respond_by_interval type="int">) </dtml-if> <dtml-else> null </dtml-if>, - <dtml-sqlvar support_of type="int" optional> - <dtml-if date_opened> - , <dtml-sqlvar date_opened type="string"> + <dtml-sqlvar sqv_support_of type="int" optional> + <dtml-if sqv_date_opened> + , <dtml-sqlvar sqv_date_opened type="string"> <dtml-else> , NOW() </dtml-if> - <dtml-if date_responded>,<dtml-sqlvar date_responded type="string"></dtml-if> - <dtml-if date_closed>,<dtml-sqlvar date_closed type="string"></dtml-if>) + <dtml-if sqv_date_responded>,<dtml-sqlvar sqv_date_responded type="string"></dtml-if> + <dtml-if sqv_date_closed>,<dtml-sqlvar sqv_date_closed type="string"></dtml-if>) <dtml-var sql_delimiter> @@ -51,7 +51,7 @@ INSERT INTO mm_ticket_index ( id, body, html_body ) VALUES ( - <dtml-sqlvar id type="int">, + <dtml-sqlvar sqv_id type="int">, NULL, NULL ) <dtml-var sql_delimiter> </dtml-if> Index: addTemplate.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addTemplate.zsql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- addTemplate.zsql 14 Sep 2005 13:20:44 -0000 1.2 +++ addTemplate.zsql 7 Nov 2005 10:16:49 -0000 1.3 @@ -1,14 +1,14 @@ <dtml-comment> title:Add a reply template connection_id:mailmanager_db -arguments: name body html +arguments:sqv_name sqv_body sqv_html </dtml-comment> INSERT INTO <dtml-var schema>mm_templates ( name, body, html ) VALUES ( - <dtml-sqlvar name type="nb">, - <dtml-sqlvar body type="nb">, - <dtml-sqlvar html type="nb"> + <dtml-sqlvar sqv_name type="nb">, + <dtml-sqlvar sqv_body type="nb">, + <dtml-sqlvar sqv_html type="nb"> ) |