Fossil SCM
Move RSS encoded:content to position of description.
Commit
accf1b5e4330d73e5eb4f314b499c41dfe741754092942aaddfc8f5f15818338
Parent
d8f7dc472f257c9…
1 file changed
+7
-8
+7
-8
| --- src/rss.c | ||
| +++ src/rss.c | ||
| @@ -487,26 +487,26 @@ | ||
| 487 | 487 | blob_reset(&contentHtml); |
| 488 | 488 | free(zDate); |
| 489 | 489 | free(zSuffix); |
| 490 | 490 | continue; |
| 491 | 491 | } |
| 492 | + | |
| 492 | 493 | @ <item> |
| 493 | 494 | @ <title>%s(zPrefix)%h(zCom)%h(zSuffix)</title> |
| 494 | 495 | if( zTechnoteId!=0 ){ |
| 495 | 496 | @ <link>%s(g.zBaseURL)/info/%s(zTechnoteId)</link> |
| 496 | 497 | }else{ |
| 497 | 498 | @ <link>%s(g.zBaseURL)/info/%s(zId)</link> |
| 498 | 499 | } |
| 499 | - if( !bHasContent ){ | |
| 500 | + if( bHasContent ){ | |
| 501 | + rss_web_emit_html_content(&contentHtml); | |
| 502 | + }else{ | |
| 500 | 503 | @ <description>%s(zPrefix)%h(zCom)%h(zSuffix)</description> |
| 501 | 504 | } |
| 502 | 505 | @ <pubDate>%s(zDate)</pubDate> |
| 503 | 506 | @ <dc:creator>%h(zAuthor)</dc:creator> |
| 504 | 507 | @ <guid>%s(g.zBaseURL)/info/%s(zId)</guid> |
| 505 | - if( bHasContent ){ | |
| 506 | - rss_web_emit_html_content(&contentHtml); | |
| 507 | - } | |
| 508 | 508 | @ </item> |
| 509 | 509 | free(zTechnoteId); |
| 510 | 510 | blob_reset(&contentHtml); |
| 511 | 511 | free(zDate); |
| 512 | 512 | free(zSuffix); |
| @@ -740,20 +740,19 @@ | ||
| 740 | 740 | if( zTechnoteId!=0 ){ |
| 741 | 741 | fossil_print("<link>%s/info/%s</link>\n", zBaseURL, zTechnoteId); |
| 742 | 742 | }else{ |
| 743 | 743 | fossil_print("<link>%s/info/%s</link>\n", zBaseURL, zId); |
| 744 | 744 | } |
| 745 | - if( !bHasContent ){ | |
| 745 | + if( bHasContent ){ | |
| 746 | + rss_cli_emit_html_content(&contentHtml); | |
| 747 | + }else{ | |
| 746 | 748 | fossil_print("<description>%s%h%h</description>\n", |
| 747 | 749 | zPrefix, zCom, zSuffix); |
| 748 | 750 | } |
| 749 | 751 | fossil_print("<pubDate>%s</pubDate>\n", zDate); |
| 750 | 752 | fossil_print("<dc:creator>%h</dc:creator>\n", zAuthor); |
| 751 | 753 | fossil_print("<guid>%s/info/%s</guid>\n", g.zBaseURL, zId); |
| 752 | - if( bHasContent ){ | |
| 753 | - rss_cli_emit_html_content(&contentHtml); | |
| 754 | - } | |
| 755 | 754 | fossil_print("</item>\n"); |
| 756 | 755 | free(zTechnoteId); |
| 757 | 756 | blob_reset(&contentHtml); |
| 758 | 757 | free(zDate); |
| 759 | 758 | free(zSuffix); |
| 760 | 759 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -487,26 +487,26 @@ | |
| 487 | blob_reset(&contentHtml); |
| 488 | free(zDate); |
| 489 | free(zSuffix); |
| 490 | continue; |
| 491 | } |
| 492 | @ <item> |
| 493 | @ <title>%s(zPrefix)%h(zCom)%h(zSuffix)</title> |
| 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); |
| 507 | } |
| 508 | @ </item> |
| 509 | free(zTechnoteId); |
| 510 | blob_reset(&contentHtml); |
| 511 | free(zDate); |
| 512 | free(zSuffix); |
| @@ -740,20 +740,19 @@ | |
| 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 | } |
| 755 | fossil_print("</item>\n"); |
| 756 | free(zTechnoteId); |
| 757 | blob_reset(&contentHtml); |
| 758 | free(zDate); |
| 759 | free(zSuffix); |
| 760 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -487,26 +487,26 @@ | |
| 487 | blob_reset(&contentHtml); |
| 488 | free(zDate); |
| 489 | free(zSuffix); |
| 490 | continue; |
| 491 | } |
| 492 | |
| 493 | @ <item> |
| 494 | @ <title>%s(zPrefix)%h(zCom)%h(zSuffix)</title> |
| 495 | if( zTechnoteId!=0 ){ |
| 496 | @ <link>%s(g.zBaseURL)/info/%s(zTechnoteId)</link> |
| 497 | }else{ |
| 498 | @ <link>%s(g.zBaseURL)/info/%s(zId)</link> |
| 499 | } |
| 500 | if( bHasContent ){ |
| 501 | rss_web_emit_html_content(&contentHtml); |
| 502 | }else{ |
| 503 | @ <description>%s(zPrefix)%h(zCom)%h(zSuffix)</description> |
| 504 | } |
| 505 | @ <pubDate>%s(zDate)</pubDate> |
| 506 | @ <dc:creator>%h(zAuthor)</dc:creator> |
| 507 | @ <guid>%s(g.zBaseURL)/info/%s(zId)</guid> |
| 508 | @ </item> |
| 509 | free(zTechnoteId); |
| 510 | blob_reset(&contentHtml); |
| 511 | free(zDate); |
| 512 | free(zSuffix); |
| @@ -740,20 +740,19 @@ | |
| 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 | rss_cli_emit_html_content(&contentHtml); |
| 747 | }else{ |
| 748 | fossil_print("<description>%s%h%h</description>\n", |
| 749 | zPrefix, zCom, zSuffix); |
| 750 | } |
| 751 | fossil_print("<pubDate>%s</pubDate>\n", zDate); |
| 752 | fossil_print("<dc:creator>%h</dc:creator>\n", zAuthor); |
| 753 | fossil_print("<guid>%s/info/%s</guid>\n", g.zBaseURL, zId); |
| 754 | fossil_print("</item>\n"); |
| 755 | free(zTechnoteId); |
| 756 | blob_reset(&contentHtml); |
| 757 | free(zDate); |
| 758 | free(zSuffix); |
| 759 |