Fossil SCM

Simplify some the "name" parameter to the "artifact" URIs.

drh 2011-06-29 17:10 trunk

Commit 5acc3e4cc43f413f22300afcd652bb6e13223d32

Parent 082c02a80cdcd38…

2 files changed +1 -1 +11 -5

M src/browse.c

+1 -1

		--- src/browse.c
		+++ src/browse.c
		@@ -267,11 +267,11 @@
267	267	if( zFN[0]=='/' ){
268	268	zFN++;
269	269	@ <li><a href="%s(zSubdirLink)%T(zFN)">%h(zFN)/</a></li>
270	270	}else if( zCI ){
271	271	const char *zUuid = db_column_text(&q, 1);
272		- @ <li><a href="%s(g.zTop)/artifact?name=%s(zUuid)">%h(zFN)</a></li>
	272	+ @ <li><a href="%s(g.zTop)/artifact/%s(zUuid)">%h(zFN)</a></li>
273	273	}else{
274	274	@ <li><a href="%s(g.zTop)/finfo?name=%T(zPrefix)%T(zFN)">%h(zFN)
275	275	@ </a></li>
276	276	}
277	277	}
278	278

	--- src/browse.c
	+++ src/browse.c
	@@ -267,11 +267,11 @@
267	if( zFN[0]=='/' ){
268	zFN++;
269	@ <li><a href="%s(zSubdirLink)%T(zFN)">%h(zFN)/</a></li>
270	}else if( zCI ){
271	const char *zUuid = db_column_text(&q, 1);
272	@ <li><a href="%s(g.zTop)/artifact?name=%s(zUuid)">%h(zFN)</a></li>
273	}else{
274	@ <li><a href="%s(g.zTop)/finfo?name=%T(zPrefix)%T(zFN)">%h(zFN)
275	@ </a></li>
276	}
277	}
278

	--- src/browse.c
	+++ src/browse.c
	@@ -267,11 +267,11 @@
267	if( zFN[0]=='/' ){
268	zFN++;
269	@ <li><a href="%s(zSubdirLink)%T(zFN)">%h(zFN)/</a></li>
270	}else if( zCI ){
271	const char *zUuid = db_column_text(&q, 1);
272	@ <li><a href="%s(g.zTop)/artifact/%s(zUuid)">%h(zFN)</a></li>
273	}else{
274	@ <li><a href="%s(g.zTop)/finfo?name=%T(zPrefix)%T(zFN)">%h(zFN)
275	@ </a></li>
276	}
277	}
278

M src/info.c

+11 -5

		--- src/info.c
		+++ src/info.c
		@@ -1213,12 +1213,18 @@
1213	1213	}
1214	1214
1215	1215
1216	1216	/*
1217	1217	** WEBPAGE: artifact
1218		-** URL: /artifact?name=ARTIFACTID
	1218	+** URL: /artifact/ARTIFACTID
1219	1219	** URL: /artifact?ci=CHECKIN&filename=PATH
	1220	+**
	1221	+** Additional query parameters:
	1222	+**
	1223	+** ln - show line numbers
	1224	+** ln=N - highlight line number N
	1225	+** ln=M-N - highlight lines M through N inclusive
1220	1226	**
1221	1227	** Show the complete content of a file identified by ARTIFACTID
1222	1228	** as preformatted text.
1223	1229	*/
1224	1230	void artifact_page(void){
		@@ -1260,24 +1266,24 @@
1260	1266	zMime = mimetype_from_name(blob_str(&downloadName));
1261	1267	if( zMime ){
1262	1268	if( fossil_strcmp(zMime, "text/html")==0 ){
1263	1269	if( P("txt") ){
1264	1270	style_submenu_element("Html", "Html",
1265		- "%s/artifact?name=%s", g.zTop, zUuid);
	1271	+ "%s/artifact/%s", g.zTop, zUuid);
1266	1272	}else{
1267	1273	renderAsHtml = 1;
1268	1274	style_submenu_element("Text", "Text",
1269		- "%s/artifact?name=%s&txt=1", g.zTop, zUuid);
	1275	+ "%s/artifact/%s?txt=1", g.zTop, zUuid);
1270	1276	}
1271	1277	}else if( fossil_strcmp(zMime, "application/x-fossil-wiki")==0 ){
1272	1278	if( P("txt") ){
1273	1279	style_submenu_element("Wiki", "Wiki",
1274		- "%s/artifact?name=%s", g.zTop, zUuid);
	1280	+ "%s/artifact/%s", g.zTop, zUuid);
1275	1281	}else{
1276	1282	renderAsWiki = 1;
1277	1283	style_submenu_element("Text", "Text",
1278		- "%s/artifact?name=%s&txt=1", g.zTop, zUuid);
	1284	+ "%s/artifact/%s?txt=1", g.zTop, zUuid);
1279	1285	}
1280	1286	}
1281	1287	}
1282	1288	@ </p></blockquote>
1283	1289	@ <hr />
1284	1290

	--- src/info.c
	+++ src/info.c
	@@ -1213,12 +1213,18 @@
1213	}
1214
1215
1216	/*
1217	** WEBPAGE: artifact
1218	** URL: /artifact?name=ARTIFACTID
1219	** URL: /artifact?ci=CHECKIN&filename=PATH






1220	**
1221	** Show the complete content of a file identified by ARTIFACTID
1222	** as preformatted text.
1223	*/
1224	void artifact_page(void){
	@@ -1260,24 +1266,24 @@
1260	zMime = mimetype_from_name(blob_str(&downloadName));
1261	if( zMime ){
1262	if( fossil_strcmp(zMime, "text/html")==0 ){
1263	if( P("txt") ){
1264	style_submenu_element("Html", "Html",
1265	"%s/artifact?name=%s", g.zTop, zUuid);
1266	}else{
1267	renderAsHtml = 1;
1268	style_submenu_element("Text", "Text",
1269	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1270	}
1271	}else if( fossil_strcmp(zMime, "application/x-fossil-wiki")==0 ){
1272	if( P("txt") ){
1273	style_submenu_element("Wiki", "Wiki",
1274	"%s/artifact?name=%s", g.zTop, zUuid);
1275	}else{
1276	renderAsWiki = 1;
1277	style_submenu_element("Text", "Text",
1278	"%s/artifact?name=%s&txt=1", g.zTop, zUuid);
1279	}
1280	}
1281	}
1282	@ </p></blockquote>
1283	@ <hr />
1284

	--- src/info.c
	+++ src/info.c
	@@ -1213,12 +1213,18 @@
1213	}
1214
1215
1216	/*
1217	** WEBPAGE: artifact
1218	** URL: /artifact/ARTIFACTID
1219	** URL: /artifact?ci=CHECKIN&filename=PATH
1220	**
1221	** Additional query parameters:
1222	**
1223	** ln - show line numbers
1224	** ln=N - highlight line number N
1225	** ln=M-N - highlight lines M through N inclusive
1226	**
1227	** Show the complete content of a file identified by ARTIFACTID
1228	** as preformatted text.
1229	*/
1230	void artifact_page(void){
	@@ -1260,24 +1266,24 @@
1266	zMime = mimetype_from_name(blob_str(&downloadName));
1267	if( zMime ){
1268	if( fossil_strcmp(zMime, "text/html")==0 ){
1269	if( P("txt") ){
1270	style_submenu_element("Html", "Html",
1271	"%s/artifact/%s", g.zTop, zUuid);
1272	}else{
1273	renderAsHtml = 1;
1274	style_submenu_element("Text", "Text",
1275	"%s/artifact/%s?txt=1", g.zTop, zUuid);
1276	}
1277	}else if( fossil_strcmp(zMime, "application/x-fossil-wiki")==0 ){
1278	if( P("txt") ){
1279	style_submenu_element("Wiki", "Wiki",
1280	"%s/artifact/%s", g.zTop, zUuid);
1281	}else{
1282	renderAsWiki = 1;
1283	style_submenu_element("Text", "Text",
1284	"%s/artifact/%s?txt=1", g.zTop, zUuid);
1285	}
1286	}
1287	}
1288	@ </p></blockquote>
1289	@ <hr />
1290

Fossil SCM

Keyboard Shortcuts