Fossil SCM
Omit RSS descriptions when HTML content is available.
Commit
d8f7dc472f257c91ce1936d0a3e8f6d340747a76929a58003011702061ef234b
Parent
4fbde38d59da385…
1 file changed
+7
-2
+7
-2
| --- src/rss.c | ||
| +++ src/rss.c | ||
| @@ -494,11 +494,13 @@ | ||
| 494 | 494 | if( zTechnoteId!=0 ){ |
| 495 | 495 | @ <link>%s(g.zBaseURL)/info/%s(zTechnoteId)</link> |
| 496 | 496 | }else{ |
| 497 | 497 | @ <link>%s(g.zBaseURL)/info/%s(zId)</link> |
| 498 | 498 | } |
| 499 | - @ <description>%s(zPrefix)%h(zCom)%h(zSuffix)</description> | |
| 499 | + if( !bHasContent ){ | |
| 500 | + @ <description>%s(zPrefix)%h(zCom)%h(zSuffix)</description> | |
| 501 | + } | |
| 500 | 502 | @ <pubDate>%s(zDate)</pubDate> |
| 501 | 503 | @ <dc:creator>%h(zAuthor)</dc:creator> |
| 502 | 504 | @ <guid>%s(g.zBaseURL)/info/%s(zId)</guid> |
| 503 | 505 | if( bHasContent ){ |
| 504 | 506 | rss_web_emit_html_content(&contentHtml); |
| @@ -738,11 +740,14 @@ | ||
| 738 | 740 | if( zTechnoteId!=0 ){ |
| 739 | 741 | fossil_print("<link>%s/info/%s</link>\n", zBaseURL, zTechnoteId); |
| 740 | 742 | }else{ |
| 741 | 743 | fossil_print("<link>%s/info/%s</link>\n", zBaseURL, zId); |
| 742 | 744 | } |
| 743 | - fossil_print("<description>%s%h%h</description>\n", zPrefix, zCom, zSuffix); | |
| 745 | + if( !bHasContent ){ | |
| 746 | + fossil_print("<description>%s%h%h</description>\n", | |
| 747 | + zPrefix, zCom, zSuffix); | |
| 748 | + } | |
| 744 | 749 | fossil_print("<pubDate>%s</pubDate>\n", zDate); |
| 745 | 750 | fossil_print("<dc:creator>%h</dc:creator>\n", zAuthor); |
| 746 | 751 | fossil_print("<guid>%s/info/%s</guid>\n", g.zBaseURL, zId); |
| 747 | 752 | if( bHasContent ){ |
| 748 | 753 | rss_cli_emit_html_content(&contentHtml); |
| 749 | 754 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -494,11 +494,13 @@ | |
| 494 | if( zTechnoteId!=0 ){ |
| 495 | @ <link>%s(g.zBaseURL)/info/%s(zTechnoteId)</link> |
| 496 | }else{ |
| 497 | @ <link>%s(g.zBaseURL)/info/%s(zId)</link> |
| 498 | } |
| 499 | @ <description>%s(zPrefix)%h(zCom)%h(zSuffix)</description> |
| 500 | @ <pubDate>%s(zDate)</pubDate> |
| 501 | @ <dc:creator>%h(zAuthor)</dc:creator> |
| 502 | @ <guid>%s(g.zBaseURL)/info/%s(zId)</guid> |
| 503 | if( bHasContent ){ |
| 504 | rss_web_emit_html_content(&contentHtml); |
| @@ -738,11 +740,14 @@ | |
| 738 | if( zTechnoteId!=0 ){ |
| 739 | fossil_print("<link>%s/info/%s</link>\n", zBaseURL, zTechnoteId); |
| 740 | }else{ |
| 741 | fossil_print("<link>%s/info/%s</link>\n", zBaseURL, zId); |
| 742 | } |
| 743 | fossil_print("<description>%s%h%h</description>\n", zPrefix, zCom, zSuffix); |
| 744 | fossil_print("<pubDate>%s</pubDate>\n", zDate); |
| 745 | fossil_print("<dc:creator>%h</dc:creator>\n", zAuthor); |
| 746 | fossil_print("<guid>%s/info/%s</guid>\n", g.zBaseURL, zId); |
| 747 | if( bHasContent ){ |
| 748 | rss_cli_emit_html_content(&contentHtml); |
| 749 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -494,11 +494,13 @@ | |
| 494 | if( zTechnoteId!=0 ){ |
| 495 | @ <link>%s(g.zBaseURL)/info/%s(zTechnoteId)</link> |
| 496 | }else{ |
| 497 | @ <link>%s(g.zBaseURL)/info/%s(zId)</link> |
| 498 | } |
| 499 | if( !bHasContent ){ |
| 500 | @ <description>%s(zPrefix)%h(zCom)%h(zSuffix)</description> |
| 501 | } |
| 502 | @ <pubDate>%s(zDate)</pubDate> |
| 503 | @ <dc:creator>%h(zAuthor)</dc:creator> |
| 504 | @ <guid>%s(g.zBaseURL)/info/%s(zId)</guid> |
| 505 | if( bHasContent ){ |
| 506 | rss_web_emit_html_content(&contentHtml); |
| @@ -738,11 +740,14 @@ | |
| 740 | if( zTechnoteId!=0 ){ |
| 741 | fossil_print("<link>%s/info/%s</link>\n", zBaseURL, zTechnoteId); |
| 742 | }else{ |
| 743 | fossil_print("<link>%s/info/%s</link>\n", zBaseURL, zId); |
| 744 | } |
| 745 | if( !bHasContent ){ |
| 746 | fossil_print("<description>%s%h%h</description>\n", |
| 747 | zPrefix, zCom, zSuffix); |
| 748 | } |
| 749 | fossil_print("<pubDate>%s</pubDate>\n", zDate); |
| 750 | fossil_print("<dc:creator>%h</dc:creator>\n", zAuthor); |
| 751 | fossil_print("<guid>%s/info/%s</guid>\n", g.zBaseURL, zId); |
| 752 | if( bHasContent ){ |
| 753 | rss_cli_emit_html_content(&contentHtml); |
| 754 |