Fossil SCM

made /json/timeline/wiki and /json/wiki/timeline aliases.

stephan 2011-09-26 19:30 UTC json

Commit 0475e63d44d86de21b41be86a78c2112eaa509e4

Parent ecdbce165136d72…

1 file changed +24 -23

M src/json.c

+24 -23

		--- src/json.c
		+++ src/json.c
		@@ -1532,23 +1532,45 @@
1532	1532	return jv;
1533	1533	#undef SETBUF
1534	1534	}
1535	1535
1536	1536
1537		-static cson_value * json_wiki_list();
	1537	+static cson_value * json_wiki_create();
1538	1538	static cson_value * json_wiki_get();
	1539	+static cson_value * json_wiki_list();
1539	1540	static cson_value * json_wiki_save();
1540		-static cson_value * json_wiki_create();
	1541	+static cson_value * json_timeline_ci();
	1542	+static cson_value * json_timeline_ticket();
	1543	+static cson_value * json_timeline_wiki();
1541	1544
1542	1545	/*
1543	1546	** Mapping of /json/wiki/XXX commands/paths to callbacks.
1544	1547	*/
1545	1548	static const JsonPageDef JsonPageDefs_Wiki[] = {
1546	1549	{"create", json_wiki_create, 1},
1547	1550	{"get", json_wiki_get, 0},
1548	1551	{"list", json_wiki_list, 0},
1549	1552	{"save", json_wiki_save, 1},
	1553	+{"timeline", json_timeline_wiki,0},
	1554	+/* Last entry MUST have a NULL name. */
	1555	+{NULL,NULL,0}
	1556	+};
	1557	+
	1558	+/*
	1559	+** Mapping of /json/timeline/XXX commands/paths to callbacks.
	1560	+*/
	1561	+static const JsonPageDef JsonPageDefs_Timeline[] = {
	1562	+{"c", json_timeline_ci, 0},
	1563	+{"ci", json_timeline_ci, 0},
	1564	+{"com", json_timeline_ci, 0},
	1565	+{"commit", json_timeline_ci, 0},
	1566	+{"t", json_timeline_ticket, 0},
	1567	+{"ticket", json_timeline_ticket, 0},
	1568	+{"w", json_timeline_wiki, 0},
	1569	+{"wi", json_timeline_wiki, 0},
	1570	+{"wik", json_timeline_wiki, 0},
	1571	+{"wiki", json_timeline_wiki, 0},
1550	1572	/* Last entry MUST have a NULL name. */
1551	1573	{NULL,NULL,0}
1552	1574	};
1553	1575
1554	1576	/*
		@@ -1920,31 +1942,10 @@
1920	1942	}
1921	1943	}
1922	1944	return payV;
1923	1945	}
1924	1946
1925		-static cson_value * json_timeline_ci();
1926		-static cson_value * json_timeline_wiki();
1927		-static cson_value * json_timeline_ticket();
1928		-/*
1929		-** Mapping of /json/timeline/XXX commands/paths to callbacks.
1930		-*/
1931		-static const JsonPageDef JsonPageDefs_Timeline[] = {
1932		-{"c", json_timeline_ci, 0},
1933		-{"ci", json_timeline_ci, 0},
1934		-{"com", json_timeline_ci, 0},
1935		-{"commit", json_timeline_ci, 0},
1936		-{"t", json_timeline_ticket, 0},
1937		-{"ticket", json_timeline_ticket, 0},
1938		-{"w", json_timeline_wiki, 0},
1939		-{"wi", json_timeline_wiki, 0},
1940		-{"wik", json_timeline_wiki, 0},
1941		-{"wiki", json_timeline_wiki, 0},
1942		-/* Last entry MUST have a NULL name. */
1943		-{NULL,NULL,0}
1944		-};
1945		-
1946	1947	/*
1947	1948	** Implements the /json/timeline family of pages/commands. Far from
1948	1949	** complete.
1949	1950	**
1950	1951	*/
1951	1952

	--- src/json.c
	+++ src/json.c
	@@ -1532,23 +1532,45 @@
1532	return jv;
1533	#undef SETBUF
1534	}
1535
1536
1537	static cson_value * json_wiki_list();
1538	static cson_value * json_wiki_get();

1539	static cson_value * json_wiki_save();
1540	static cson_value * json_wiki_create();


1541
1542	/*
1543	** Mapping of /json/wiki/XXX commands/paths to callbacks.
1544	*/
1545	static const JsonPageDef JsonPageDefs_Wiki[] = {
1546	{"create", json_wiki_create, 1},
1547	{"get", json_wiki_get, 0},
1548	{"list", json_wiki_list, 0},
1549	{"save", json_wiki_save, 1},



















1550	/* Last entry MUST have a NULL name. */
1551	{NULL,NULL,0}
1552	};
1553
1554	/*
	@@ -1920,31 +1942,10 @@
1920	}
1921	}
1922	return payV;
1923	}
1924
1925	static cson_value * json_timeline_ci();
1926	static cson_value * json_timeline_wiki();
1927	static cson_value * json_timeline_ticket();
1928	/*
1929	** Mapping of /json/timeline/XXX commands/paths to callbacks.
1930	*/
1931	static const JsonPageDef JsonPageDefs_Timeline[] = {
1932	{"c", json_timeline_ci, 0},
1933	{"ci", json_timeline_ci, 0},
1934	{"com", json_timeline_ci, 0},
1935	{"commit", json_timeline_ci, 0},
1936	{"t", json_timeline_ticket, 0},
1937	{"ticket", json_timeline_ticket, 0},
1938	{"w", json_timeline_wiki, 0},
1939	{"wi", json_timeline_wiki, 0},
1940	{"wik", json_timeline_wiki, 0},
1941	{"wiki", json_timeline_wiki, 0},
1942	/* Last entry MUST have a NULL name. */
1943	{NULL,NULL,0}
1944	};
1945
1946	/*
1947	** Implements the /json/timeline family of pages/commands. Far from
1948	** complete.
1949	**
1950	*/
1951

	--- src/json.c
	+++ src/json.c
	@@ -1532,23 +1532,45 @@
1532	return jv;
1533	#undef SETBUF
1534	}
1535
1536
1537	static cson_value * json_wiki_create();
1538	static cson_value * json_wiki_get();
1539	static cson_value * json_wiki_list();
1540	static cson_value * json_wiki_save();
1541	static cson_value * json_timeline_ci();
1542	static cson_value * json_timeline_ticket();
1543	static cson_value * json_timeline_wiki();
1544
1545	/*
1546	** Mapping of /json/wiki/XXX commands/paths to callbacks.
1547	*/
1548	static const JsonPageDef JsonPageDefs_Wiki[] = {
1549	{"create", json_wiki_create, 1},
1550	{"get", json_wiki_get, 0},
1551	{"list", json_wiki_list, 0},
1552	{"save", json_wiki_save, 1},
1553	{"timeline", json_timeline_wiki,0},
1554	/* Last entry MUST have a NULL name. */
1555	{NULL,NULL,0}
1556	};
1557
1558	/*
1559	** Mapping of /json/timeline/XXX commands/paths to callbacks.
1560	*/
1561	static const JsonPageDef JsonPageDefs_Timeline[] = {
1562	{"c", json_timeline_ci, 0},
1563	{"ci", json_timeline_ci, 0},
1564	{"com", json_timeline_ci, 0},
1565	{"commit", json_timeline_ci, 0},
1566	{"t", json_timeline_ticket, 0},
1567	{"ticket", json_timeline_ticket, 0},
1568	{"w", json_timeline_wiki, 0},
1569	{"wi", json_timeline_wiki, 0},
1570	{"wik", json_timeline_wiki, 0},
1571	{"wiki", json_timeline_wiki, 0},
1572	/* Last entry MUST have a NULL name. */
1573	{NULL,NULL,0}
1574	};
1575
1576	/*
	@@ -1920,31 +1942,10 @@
1942	}
1943	}
1944	return payV;
1945	}
1946





















1947	/*
1948	** Implements the /json/timeline family of pages/commands. Far from
1949	** complete.
1950	**
1951	*/
1952

Fossil SCM

Keyboard Shortcuts