Index: openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl,v
diff -u -r1.19.2.4 -r1.19.2.5
--- openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl 28 Dec 2021 14:27:18 -0000 1.19.2.4
+++ openacs-4/packages/acs-content-repository/tcl/publish-procs.tcl 28 Dec 2021 14:36:13 -0000 1.19.2.5
@@ -305,15 +305,12 @@
@private html_args
- Concatenate a list of name-value pairs as returned by
- <tt>set_to_pairs</tt> into a list of "name=value" pairs
+ Concatenate a list of name-value pairs as a list of "name=value"
+ pairs.
@param argv The list of name-value pairs
@return An HTML string in format "name=value name=value ..."
-
- @see publish::set_to_pairs
-
} {
set extra_html ""
if { ![template::util::is_nil argv] } {
@@ -829,32 +826,6 @@
# The content tags
-ad_proc -private publish::set_to_pairs { params {exclusion_list ""} } {
-
- @private set_to_pairs
-
- Convert an ns_set into a list of name-value pairs, in form
- {name value name value ...}
-
- @param params The ns_set id
- @param exclusion_list {}
- A list of keys to be ignored
-
- @return A list of name-value pairs representing the data in the ns_set
-
-} {
-
- set extra_args [list]
- foreach {key value} [ns_set array $params] {
- if { $key ni $exclusion_list } {
- lappend extra_args $key $value
- }
- }
-
- return $extra_args
-}
-
-
ad_proc -private publish::process_tag { relation_type params } {
@private process_tag
@@ -877,8 +848,12 @@
set parent_item_id [ns_set iget $params parent_item_id]
# Concatenate all other keys into the extra arguments list
- set extra_args [publish::set_to_pairs $params \
- {tag index embed parent_item_id}]
+ set extra_args [list]
+ foreach {key value} [ns_set array $params] {
+ if {$key ni {tag index embed parent_item_id}} {
+ lappend extra_args $key $value
+ }
+ }
# Render the item, append it to the page
# set item_id [publish::get_main_item_id]
Index: openacs-4/packages/acs-templating/lib/body_scripts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/lib/body_scripts.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-templating/lib/body_scripts.adp 8 Dec 2020 19:49:56 -0000 1.1.2.1
+++ openacs-4/packages/acs-templating/lib/body_scripts.adp 28 Dec 2021 14:36:13 -0000 1.1.2.2
@@ -1,2 +1,2 @@
<multiple name="body_script"><script type="@body_script.type;literal@"<if @body_script.src@ not nil> src="@body_script.src;literal@"</if><if @body_script.charset@ not nil> charset="@body_script.charset;literal@"</if><if @body_script.defer@ not nil> defer="@body_script.defer;literal@"</if><if @body_script.async@ not nil> async="@body_script.async;literal@"</if><if @body_script.integrity@ not nil> integrity="@body_script.integrity;literal@"</if><if @body_script.crossorigin@ not nil> crossorigin="@body_script.crossorigin;literal@"</if><if @::__csp_nonce@ not nil> nonce="@::__csp_nonce;literal@"</if>><if @body_script.content@ not nil>@body_script.content;literal@</if></script>
-</multiple>
\ No newline at end of file
+</multiple>
Index: openacs-4/packages/acs-templating/www/doc/TclDocs/publish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/TclDocs/publish.adp,v
diff -u -r1.5.2.3 -r1.5.2.4
--- openacs-4/packages/acs-templating/www/doc/TclDocs/publish.adp 3 Sep 2021 09:16:11 -0000 1.5.2.3
+++ openacs-4/packages/acs-templating/www/doc/TclDocs/publish.adp 28 Dec 2021 14:36:13 -0000 1.5.2.4
@@ -475,8 +475,7 @@
</table>
<table width="100%">
<tr><td width="100%" bgcolor="#CCCCFF"><a name="publish::html_args" id="publish::html_args"><font size="+1" weight="bold">publish::html_args</font></a></td></tr><tr><td>
-<blockquote>Concatenate a list of name-value pairs as returned by
-<kbd>set_to_pairs</kbd> into a list of { name=value}
+<blockquote>Concatenate a list of name-value pairs as a list of { name=value}
pairs</blockquote><dl>
<dd>
<strong>Parameters:</strong><table><tr>
@@ -485,8 +484,7 @@
</td><td align="left">The list of name-value pairs</td>
</tr></table>
</dd><dt><strong>Returns:</strong></dt><dd>An HTML string in format " name=value name=value
-..."</dd><dt><strong>See Also:</strong></dt><dd>proc - <a href="publish">publish::set_to_pairs</a><br>
-</dd>
+..."</dd>
</dl>
</td></tr>
</table>
@@ -628,27 +626,6 @@
</td></tr>
</table>
<table width="100%">
-<tr><td width="100%" bgcolor="#CCCCFF"><a name="publish::set_to_pairs" id="publish::set_to_pairs"><font size="+1" weight="bold">publish::set_to_pairs</font></a></td></tr><tr><td>
-<blockquote>Convert an ns_set into a list of name-value pairs, in
-form {name value name value ...}</blockquote><dl>
-<dd>
-<strong>Parameters:</strong><table>
-<tr>
-<td align="right">
-<code>params</code><font color="red">*</font>
-</td><td align="left">The ns_set id</td>
-</tr><tr>
-<td align="right">
-<code>exclusion_list</code><font color="red">*</font>
-</td><td align="left">{} A list of keys to be ignored</td>
-</tr>
-</table>
-</dd><dt><strong>Returns:</strong></dt><dd>A list of name-value pairs representing the data in the
-ns_set</dd>
-</dl>
-</td></tr>
-</table>
-<table width="100%">
<tr><td width="100%" bgcolor="#CCCCFF"><a name="publish::track_publish_status" id="publish::track_publish_status"><font size="+1" weight="bold">publish::track_publish_status</font></a></td></tr><tr><td>
<blockquote>Scheduled proc which keeps the publish status
updated</blockquote><dl>
Index: openacs-4/packages/acs-templating/www/doc/TclDocs/publish.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/TclDocs/publish.html,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-templating/www/doc/TclDocs/publish.html 15 Aug 2019 10:13:07 -0000 1.5.2.1
+++ openacs-4/packages/acs-templating/www/doc/TclDocs/publish.html 28 Dec 2021 14:36:13 -0000 1.5.2.2
@@ -874,7 +874,7 @@
</tr>
<tr><td>
<blockquote>
-Concatenate a list of name-value pairs as returned by <kbd>set_to_pairs</kbd> into a list of { name=value} pairs
+Concatenate a list of name-value pairs as a list of { name=value} pairs
</blockquote>
<dl>
@@ -893,10 +893,6 @@
<dt><strong>Returns:</strong>
<dd>
An HTML string in format " name=value name=value ..."
-
- <dt><strong>See Also:</strong>
-
- <dd>proc - <a href="publish.html#publish::set_to_pairs">publish::set_to_pairs</a></br>
</dl>
</td>
</tr>
@@ -1144,46 +1140,6 @@
<p>
<table width="100%"><tr><td width="100%" bgcolor="#CCCCFF">
- <a name="publish::set_to_pairs"><font size="+1" weight=bold>publish::set_to_pairs</font></a>
-
-</td>
-</tr>
-<tr><td>
-<blockquote>
-Convert an ns_set into a list of name-value pairs, in form {name value name value ...}
-</blockquote>
-<dl>
-
- <strong>Parameters:</strong>
- <table>
-
- <tr>
- <td align="right"><code>params</code>
- <font color=red>*</font></td>
- <td align="left">
-
- The ns_set id</td></tr>
-
- <tr>
- <td align="right"><code>exclusion_list</code>
- <font color=red>*</font></td>
- <td align="left">
-
- {} A list of keys to be ignored</td></tr>
-
- </table>
-
- <dt><strong>Returns:</strong>
- <dd>
- A list of name-value pairs representing the data in the ns_set
-
-</dl>
-</td>
-</tr>
-</table>
-
-<p>
-<table width="100%"><tr><td width="100%" bgcolor="#CCCCFF">
<a name="publish::track_publish_status"><font size="+1" weight=bold>publish::track_publish_status</font></a>
</td>