Fossil SCM
Added -url URL flag to set the RSS base URL.
Commit
584c682cad294ce9e188f8443ce3308cff2bfb7f
Parent
e28a5765faf5aea…
1 file changed
+7
-3
+7
-3
| --- src/rss.c | ||
| +++ src/rss.c | ||
| @@ -218,10 +218,11 @@ | ||
| 218 | 218 | const char *zTicketUuid = find_option("tkt",NULL,1); |
| 219 | 219 | const char *zTag = find_option("tag",NULL,1); |
| 220 | 220 | const char *zFilename = find_option("name",NULL,1); |
| 221 | 221 | const char *zWiki = find_option("wiki",NULL,1); |
| 222 | 222 | const char *zLimit = find_option("limit", "n",1); |
| 223 | + const char *zBaseURL = find_option("url", NULL, 1); | |
| 223 | 224 | int nLimit = atoi( (zLimit && *zLimit) ? zLimit : "20" ); |
| 224 | 225 | int nTagId; |
| 225 | 226 | const char zSQL1[] = |
| 226 | 227 | @ SELECT |
| 227 | 228 | @ blob.rid, |
| @@ -235,10 +236,13 @@ | ||
| 235 | 236 | @ WHERE blob.rid=event.objid |
| 236 | 237 | ; |
| 237 | 238 | if(!zType || !*zType){ |
| 238 | 239 | zType = "all"; |
| 239 | 240 | } |
| 241 | + if(!zBaseURL || !*zBaseURL){ | |
| 242 | + zBaseURL = "URL-PLACEHOLDER"; | |
| 243 | + } | |
| 240 | 244 | |
| 241 | 245 | db_find_and_open_repository(0, 0); |
| 242 | 246 | |
| 243 | 247 | blob_zero(&bSQL); |
| 244 | 248 | blob_append( &bSQL, zSQL1, -1 ); |
| @@ -309,11 +313,11 @@ | ||
| 309 | 313 | blob_append( &bSQL, " ORDER BY event.mtime DESC", -1 ); |
| 310 | 314 | |
| 311 | 315 | zProjectName = db_get("project-name", 0); |
| 312 | 316 | if( zProjectName==0 ){ |
| 313 | 317 | zFreeProjectName = zProjectName = mprintf("Fossil source repository for: %s", |
| 314 | - g.zBaseURL); | |
| 318 | + zBaseURL); | |
| 315 | 319 | } |
| 316 | 320 | zProjectDescr = db_get("project-description", 0); |
| 317 | 321 | if( zProjectDescr==0 ){ |
| 318 | 322 | zProjectDescr = zProjectName; |
| 319 | 323 | } |
| @@ -322,11 +326,11 @@ | ||
| 322 | 326 | |
| 323 | 327 | fossil_print("<?xml version=\"1.0\"?>"); |
| 324 | 328 | fossil_print("<rss xmlns:dc=\"http://purl.org/dc/elements/1.1/\" version=\"2.0\">"); |
| 325 | 329 | fossil_print("<channel>\n"); |
| 326 | 330 | fossil_print("<title>%h</title>\n", zProjectName); |
| 327 | - fossil_print("<link>%s</link>\n", g.zBaseURL); | |
| 331 | + fossil_print("<link>%s</link>\n", zBaseURL); | |
| 328 | 332 | fossil_print("<description>%h</description>\n", zProjectDescr); |
| 329 | 333 | fossil_print("<pubDate>%s</pubDate>\n", zPubDate); |
| 330 | 334 | fossil_print("<generator>Fossil version %s %s</generator>\n", |
| 331 | 335 | MANIFEST_VERSION, MANIFEST_DATE); |
| 332 | 336 | free(zPubDate); |
| @@ -353,11 +357,11 @@ | ||
| 353 | 357 | zPrefix = "*FORK* "; |
| 354 | 358 | } |
| 355 | 359 | |
| 356 | 360 | fossil_print("<item>"); |
| 357 | 361 | fossil_print("<title>%s%h</title>\n", zPrefix, zCom); |
| 358 | - fossil_print("<link>%s/info/%s</link>\n", g.zBaseURL, zId); | |
| 362 | + fossil_print("<link>%s/info/%s</link>\n", zBaseURL, zId); | |
| 359 | 363 | fossil_print("<description>%s%h</description>\n", zPrefix, zCom); |
| 360 | 364 | fossil_print("<pubDate>%s</pubDate>\n", zDate); |
| 361 | 365 | fossil_print("<dc:creator>%h</dc:creator>\n", zAuthor); |
| 362 | 366 | fossil_print("<guid>%s/info/%s</guid>\n", g.zBaseURL, zId); |
| 363 | 367 | fossil_print("</item>\n"); |
| 364 | 368 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -218,10 +218,11 @@ | |
| 218 | const char *zTicketUuid = find_option("tkt",NULL,1); |
| 219 | const char *zTag = find_option("tag",NULL,1); |
| 220 | const char *zFilename = find_option("name",NULL,1); |
| 221 | const char *zWiki = find_option("wiki",NULL,1); |
| 222 | const char *zLimit = find_option("limit", "n",1); |
| 223 | int nLimit = atoi( (zLimit && *zLimit) ? zLimit : "20" ); |
| 224 | int nTagId; |
| 225 | const char zSQL1[] = |
| 226 | @ SELECT |
| 227 | @ blob.rid, |
| @@ -235,10 +236,13 @@ | |
| 235 | @ WHERE blob.rid=event.objid |
| 236 | ; |
| 237 | if(!zType || !*zType){ |
| 238 | zType = "all"; |
| 239 | } |
| 240 | |
| 241 | db_find_and_open_repository(0, 0); |
| 242 | |
| 243 | blob_zero(&bSQL); |
| 244 | blob_append( &bSQL, zSQL1, -1 ); |
| @@ -309,11 +313,11 @@ | |
| 309 | blob_append( &bSQL, " ORDER BY event.mtime DESC", -1 ); |
| 310 | |
| 311 | zProjectName = db_get("project-name", 0); |
| 312 | if( zProjectName==0 ){ |
| 313 | zFreeProjectName = zProjectName = mprintf("Fossil source repository for: %s", |
| 314 | g.zBaseURL); |
| 315 | } |
| 316 | zProjectDescr = db_get("project-description", 0); |
| 317 | if( zProjectDescr==0 ){ |
| 318 | zProjectDescr = zProjectName; |
| 319 | } |
| @@ -322,11 +326,11 @@ | |
| 322 | |
| 323 | fossil_print("<?xml version=\"1.0\"?>"); |
| 324 | fossil_print("<rss xmlns:dc=\"http://purl.org/dc/elements/1.1/\" version=\"2.0\">"); |
| 325 | fossil_print("<channel>\n"); |
| 326 | fossil_print("<title>%h</title>\n", zProjectName); |
| 327 | fossil_print("<link>%s</link>\n", g.zBaseURL); |
| 328 | fossil_print("<description>%h</description>\n", zProjectDescr); |
| 329 | fossil_print("<pubDate>%s</pubDate>\n", zPubDate); |
| 330 | fossil_print("<generator>Fossil version %s %s</generator>\n", |
| 331 | MANIFEST_VERSION, MANIFEST_DATE); |
| 332 | free(zPubDate); |
| @@ -353,11 +357,11 @@ | |
| 353 | zPrefix = "*FORK* "; |
| 354 | } |
| 355 | |
| 356 | fossil_print("<item>"); |
| 357 | fossil_print("<title>%s%h</title>\n", zPrefix, zCom); |
| 358 | fossil_print("<link>%s/info/%s</link>\n", g.zBaseURL, zId); |
| 359 | fossil_print("<description>%s%h</description>\n", zPrefix, zCom); |
| 360 | fossil_print("<pubDate>%s</pubDate>\n", zDate); |
| 361 | fossil_print("<dc:creator>%h</dc:creator>\n", zAuthor); |
| 362 | fossil_print("<guid>%s/info/%s</guid>\n", g.zBaseURL, zId); |
| 363 | fossil_print("</item>\n"); |
| 364 |
| --- src/rss.c | |
| +++ src/rss.c | |
| @@ -218,10 +218,11 @@ | |
| 218 | const char *zTicketUuid = find_option("tkt",NULL,1); |
| 219 | const char *zTag = find_option("tag",NULL,1); |
| 220 | const char *zFilename = find_option("name",NULL,1); |
| 221 | const char *zWiki = find_option("wiki",NULL,1); |
| 222 | const char *zLimit = find_option("limit", "n",1); |
| 223 | const char *zBaseURL = find_option("url", NULL, 1); |
| 224 | int nLimit = atoi( (zLimit && *zLimit) ? zLimit : "20" ); |
| 225 | int nTagId; |
| 226 | const char zSQL1[] = |
| 227 | @ SELECT |
| 228 | @ blob.rid, |
| @@ -235,10 +236,13 @@ | |
| 236 | @ WHERE blob.rid=event.objid |
| 237 | ; |
| 238 | if(!zType || !*zType){ |
| 239 | zType = "all"; |
| 240 | } |
| 241 | if(!zBaseURL || !*zBaseURL){ |
| 242 | zBaseURL = "URL-PLACEHOLDER"; |
| 243 | } |
| 244 | |
| 245 | db_find_and_open_repository(0, 0); |
| 246 | |
| 247 | blob_zero(&bSQL); |
| 248 | blob_append( &bSQL, zSQL1, -1 ); |
| @@ -309,11 +313,11 @@ | |
| 313 | blob_append( &bSQL, " ORDER BY event.mtime DESC", -1 ); |
| 314 | |
| 315 | zProjectName = db_get("project-name", 0); |
| 316 | if( zProjectName==0 ){ |
| 317 | zFreeProjectName = zProjectName = mprintf("Fossil source repository for: %s", |
| 318 | zBaseURL); |
| 319 | } |
| 320 | zProjectDescr = db_get("project-description", 0); |
| 321 | if( zProjectDescr==0 ){ |
| 322 | zProjectDescr = zProjectName; |
| 323 | } |
| @@ -322,11 +326,11 @@ | |
| 326 | |
| 327 | fossil_print("<?xml version=\"1.0\"?>"); |
| 328 | fossil_print("<rss xmlns:dc=\"http://purl.org/dc/elements/1.1/\" version=\"2.0\">"); |
| 329 | fossil_print("<channel>\n"); |
| 330 | fossil_print("<title>%h</title>\n", zProjectName); |
| 331 | fossil_print("<link>%s</link>\n", zBaseURL); |
| 332 | fossil_print("<description>%h</description>\n", zProjectDescr); |
| 333 | fossil_print("<pubDate>%s</pubDate>\n", zPubDate); |
| 334 | fossil_print("<generator>Fossil version %s %s</generator>\n", |
| 335 | MANIFEST_VERSION, MANIFEST_DATE); |
| 336 | free(zPubDate); |
| @@ -353,11 +357,11 @@ | |
| 357 | zPrefix = "*FORK* "; |
| 358 | } |
| 359 | |
| 360 | fossil_print("<item>"); |
| 361 | fossil_print("<title>%s%h</title>\n", zPrefix, zCom); |
| 362 | fossil_print("<link>%s/info/%s</link>\n", zBaseURL, zId); |
| 363 | fossil_print("<description>%s%h</description>\n", zPrefix, zCom); |
| 364 | fossil_print("<pubDate>%s</pubDate>\n", zDate); |
| 365 | fossil_print("<dc:creator>%h</dc:creator>\n", zAuthor); |
| 366 | fossil_print("<guid>%s/info/%s</guid>\n", g.zBaseURL, zId); |
| 367 | fossil_print("</item>\n"); |
| 368 |