Index: openacs-4/packages/rss-support/tcl/rss-generation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-generation-procs.tcl,v
diff -u -r1.17 -r1.17.6.1
--- openacs-4/packages/rss-support/tcl/rss-generation-procs.tcl 18 May 2009 14:42:27 -0000 1.17
+++ openacs-4/packages/rss-support/tcl/rss-generation-procs.tcl 27 Aug 2013 11:25:28 -0000 1.17.6.1
@@ -33,17 +33,17 @@
set rss ""
- if {[empty_string_p $channel_title]} {
+ if {$channel_title eq ""} {
error "argument channel_title not provided"
}
- if {[empty_string_p $channel_link]} {
+ if {$channel_link eq ""} {
error "argument channel_link not provided"
}
- if {[empty_string_p $channel_description]} {
+ if {$channel_description eq ""} {
error "argument channel_description not provided"
}
- if { [empty_string_p $channel_lastBuildDate] } {
+ if { $channel_lastBuildDate eq "" } {
set now_ansi [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S"]
set now_ansi [lc_time_tz_convert -from [lang::system::timezone] -to "Etc/GMT" -time_value $now_ansi]
set channel_lastBuildDate "[clock format [clock scan $now_ansi] -format "%a, %d %b %Y %H:%M:%S"] GMT"
@@ -58,11 +58,11 @@
append rss {OpenACS 5.0} \n
append rss "[ad_quotehtml $channel_lastBuildDate]" \n
- if { ![empty_string_p $channel_pubDate] } {
+ if { $channel_pubDate ne "" } {
append rss "[ad_quotehtml $channel_pubDate]" \n
}
- if {[empty_string_p $image]} {
+ if {$image eq ""} {
set base images/openacs_logo_rss.gif
set url [ad_url][rss_package_url]$base
set title $channel_title
@@ -110,19 +110,19 @@
append rss "[ad_quotehtml $iarray(link)]" \n
append rss {} [ad_quotehtml $iarray(link)] {} \n
- if { [exists_and_not_null iarray(description) ]} {
+ if { ([info exists iarray(description)] && $iarray(description) ne "")} {
append rss "[ad_quotehtml $iarray(description)]" \n
}
- if { [exists_and_not_null iarray(timestamp)] } {
+ if { ([info exists iarray(timestamp)] && $iarray(timestamp) ne "") } {
append rss "[ad_quotehtml $iarray(timestamp)]" \n
}
- if { [exists_and_not_null iarray(category)] } {
+ if { ([info exists iarray(category)] && $iarray(category) ne "") } {
append rss "[ad_quotehtml $iarray(category)]" \n
}
- if { [exists_and_not_null iarray(enclosure_url)] && [exists_and_not_null iarray(enclosure_length)] && [exists_and_not_null iarray(enclosure_type)] } {
+ if { ([info exists iarray(enclosure_url)] && $iarray(enclosure_url) ne "") && ([info exists iarray(enclosure_length)] && $iarray(enclosure_length) ne "") && ([info exists iarray(enclosure_type)] && $iarray(enclosure_type) ne "") } {
append rss ""
}
append rss {} \n
@@ -153,13 +153,13 @@
set rss ""
- if {[empty_string_p $channel_title]} {
+ if {$channel_title eq ""} {
error "argument channel_title not provided"
}
- if {[empty_string_p $channel_link]} {
+ if {$channel_link eq ""} {
error "argument channel_link not provided"
}
- if {[empty_string_p $channel_description]} {
+ if {$channel_description eq ""} {
error "argument channel_description not provided"
}
@@ -184,32 +184,32 @@
append rss [ad_quotehtml $channel_description]
append rss "\n"
- if {[empty_string_p $channel_pubDate]} {
+ if {$channel_pubDate eq ""} {
append rss "$channel_date\n"
} else {
append rss "[ad_quotehtml $channel_pubDate]\n"
}
- if {![empty_string_p $channel_copyright]} {
+ if {$channel_copyright ne ""} {
append rss ""
append rss [ad_quotehtml $channel_copyright]
append rss "\n"
}
- if {![empty_string_p $channel_managingEditor]} {
+ if {$channel_managingEditor ne ""} {
append rss ""
append rss [ad_quotehtml $channel_managingEditor]
append rss "\n"
}
- if {![empty_string_p $channel_webMaster]} {
+ if {$channel_webMaster ne ""} {
append rss ""
append rss [ad_quotehtml $channel_webMaster]
append rss "\n"
}
- if {[empty_string_p $image]} {
+ if {$image eq ""} {
set base images/openacs_logo_rss.gif
set url [ad_url][rss_package_url]$base
set title $channel_title
@@ -310,13 +310,13 @@
set rss ""
- if {[empty_string_p $channel_title]} {
+ if {$channel_title eq ""} {
error "argument channel_title not provided"
}
- if {[empty_string_p $channel_link]} {
+ if {$channel_link eq ""} {
error "argument channel_link not provided"
}
- if {[empty_string_p $channel_description]} {
+ if {$channel_description eq ""} {
error "argument channel_description not provided"
}
@@ -339,37 +339,37 @@
append rss [ad_quotehtml $channel_language]
append rss "\n"
- if {![empty_string_p $channel_copyright]} {
+ if {$channel_copyright ne ""} {
append rss ""
append rss [ad_quotehtml $channel_copyright]
append rss "\n"
}
- if {![empty_string_p $channel_managingEditor]} {
+ if {$channel_managingEditor ne ""} {
append rss ""
append rss [ad_quotehtml $channel_managingEditor]
append rss "\n"
}
- if {![empty_string_p $channel_webMaster]} {
+ if {$channel_webMaster ne ""} {
append rss ""
append rss [ad_quotehtml $channel_webMaster]
append rss "\n"
}
- if {![empty_string_p $channel_rating]} {
+ if {$channel_rating ne ""} {
append rss ""
append rss [ad_quotehtml $channel_rating]
append rss "\n"
}
- if {![empty_string_p $channel_pubDate]} {
+ if {$channel_pubDate ne ""} {
append rss ""
append rss [ad_quotehtml $channel_pubDate]
append rss "\n"
}
- if {![empty_string_p $channel_lastBuildDate]} {
+ if {$channel_lastBuildDate ne ""} {
append rss ""
append rss [ad_quotehtml $channel_lastBuildDate]
append rss "\n"
@@ -379,19 +379,19 @@
append rss "http://backend.userland.com/stories/rss091"
append rss "\n"
- if {![empty_string_p $channel_skipDays]} {
+ if {$channel_skipDays ne ""} {
append rss ""
append rss [ad_quotehtml $channel_skipDays]
append rss "\n"
}
- if {![empty_string_p $channel_skipHours]} {
+ if {$channel_skipHours ne ""} {
append rss ""
append rss [ad_quotehtml $channel_skipHours]
append rss "\n"
}
- if {[empty_string_p $image]} {
+ if {$image eq ""} {
set base images/openacs_logo_rss.gif
set url [ad_url][rss_package_url]$base
set title $channel_title