Fossil SCM

/json/wiki/get: renamed request.payload.page to "name" for consistency. Added a TODO to /json/tag/list.

stephan 2011-10-07 03:52 json-multitag-test
Commit 34056ea2382416a1feb871c3881093a047da80fd
Parent 3d6cc1df782e753…
4 files changed +2 -1 +1 -1 +4 +9 -4
~ ajax/index.html ~ ajax/wiki-editor.html ~ src/json_tag.c ~ src/json_wiki.c
M ajax/index.html
+2 -1
--- ajax/index.html
+++ ajax/index.html
@@ -229,11 +229,12 @@
229229
 <input type='button' value='branch/list' onclick='TheApp.cgi.sendCommand("/json/branch/list")' />
230230
 <input type='button' value='timeline/ci' onclick='TheApp.cgi.sendCommand("/json/timeline/ci?files=true")' />
231231
 <input type='button' value='timeline/wiki' onclick='TheApp.cgi.sendCommand("/json/timeline/wiki")' />
232232
 <input type='button' value='timeline/ticket' onclick='TheApp.cgi.sendCommand("/json/timeline/ticket")' />
233233
 <input type='button' value='wiki/list' onclick='TheApp.cgi.sendCommand("/json/wiki/list")' />
234
-<input type='button' value='wiki/get Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get",{page:"Fossil"})' />
234
+<input type='button' value='wiki/get Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get",{name:"Fossil"})' />
235
+<input type='button' value='wiki/get/Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get/Fossil")' />
235236
 <input type='button' value='user/list' onclick='TheApp.cgi.sendCommand("/json/user/list")' />
236237
 <input type='button' value='user/get' onclick='TheApp.cgi.sendCommand("/json/user/get?name=anonymous")' />
237238
 <input type='button' value='resultCodes' onclick='TheApp.cgi.sendCommand("/json/resultCodes")' />
238239
 <input type='button' value='tag/list' onclick='TheApp.cgi.sendCommand("/json/tag/list?includeTickets=false&raw=false")' />
239240
 <input type='button' value='tag/list/json' onclick='TheApp.cgi.sendCommand("/json/tag/list/json?raw=false")' />
240241
--- ajax/index.html
+++ ajax/index.html
@@ -229,11 +229,12 @@
229 <input type='button' value='branch/list' onclick='TheApp.cgi.sendCommand("/json/branch/list")' />
230 <input type='button' value='timeline/ci' onclick='TheApp.cgi.sendCommand("/json/timeline/ci?files=true")' />
231 <input type='button' value='timeline/wiki' onclick='TheApp.cgi.sendCommand("/json/timeline/wiki")' />
232 <input type='button' value='timeline/ticket' onclick='TheApp.cgi.sendCommand("/json/timeline/ticket")' />
233 <input type='button' value='wiki/list' onclick='TheApp.cgi.sendCommand("/json/wiki/list")' />
234 <input type='button' value='wiki/get Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get",{page:"Fossil"})' />
 
235 <input type='button' value='user/list' onclick='TheApp.cgi.sendCommand("/json/user/list")' />
236 <input type='button' value='user/get' onclick='TheApp.cgi.sendCommand("/json/user/get?name=anonymous")' />
237 <input type='button' value='resultCodes' onclick='TheApp.cgi.sendCommand("/json/resultCodes")' />
238 <input type='button' value='tag/list' onclick='TheApp.cgi.sendCommand("/json/tag/list?includeTickets=false&raw=false")' />
239 <input type='button' value='tag/list/json' onclick='TheApp.cgi.sendCommand("/json/tag/list/json?raw=false")' />
240
--- ajax/index.html
+++ ajax/index.html
@@ -229,11 +229,12 @@
229 <input type='button' value='branch/list' onclick='TheApp.cgi.sendCommand("/json/branch/list")' />
230 <input type='button' value='timeline/ci' onclick='TheApp.cgi.sendCommand("/json/timeline/ci?files=true")' />
231 <input type='button' value='timeline/wiki' onclick='TheApp.cgi.sendCommand("/json/timeline/wiki")' />
232 <input type='button' value='timeline/ticket' onclick='TheApp.cgi.sendCommand("/json/timeline/ticket")' />
233 <input type='button' value='wiki/list' onclick='TheApp.cgi.sendCommand("/json/wiki/list")' />
234 <input type='button' value='wiki/get Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get",{name:"Fossil"})' />
235 <input type='button' value='wiki/get/Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get/Fossil")' />
236 <input type='button' value='user/list' onclick='TheApp.cgi.sendCommand("/json/user/list")' />
237 <input type='button' value='user/get' onclick='TheApp.cgi.sendCommand("/json/user/get?name=anonymous")' />
238 <input type='button' value='resultCodes' onclick='TheApp.cgi.sendCommand("/json/resultCodes")' />
239 <input type='button' value='tag/list' onclick='TheApp.cgi.sendCommand("/json/tag/list?includeTickets=false&raw=false")' />
240 <input type='button' value='tag/list/json' onclick='TheApp.cgi.sendCommand("/json/tag/list/json?raw=false")' />
241
M ajax/wiki-editor.html
+1 -1
--- ajax/wiki-editor.html
+++ ajax/wiki-editor.html
@@ -198,11 +198,11 @@
198198
 if(('object' === typeof p) && p.content) {
199199
 doShow(p);
200200
 return;
201201
 }
202202
 TheApp.cgi.sendCommand('/json/wiki/get',{
203
- page:name
203
+ name:name
204204
 },{
205205
 onResponse:function(resp,req){
206206
 TheApp.onResponse(resp,req);
207207
 if(resp.resultCode) return;
208208
 var p = resp.payload;
209209
--- ajax/wiki-editor.html
+++ ajax/wiki-editor.html
@@ -198,11 +198,11 @@
198 if(('object' === typeof p) && p.content) {
199 doShow(p);
200 return;
201 }
202 TheApp.cgi.sendCommand('/json/wiki/get',{
203 page:name
204 },{
205 onResponse:function(resp,req){
206 TheApp.onResponse(resp,req);
207 if(resp.resultCode) return;
208 var p = resp.payload;
209
--- ajax/wiki-editor.html
+++ ajax/wiki-editor.html
@@ -198,11 +198,11 @@
198 if(('object' === typeof p) && p.content) {
199 doShow(p);
200 return;
201 }
202 TheApp.cgi.sendCommand('/json/wiki/get',{
203 name:name
204 },{
205 onResponse:function(resp,req){
206 TheApp.onResponse(resp,req);
207 if(resp.resultCode) return;
208 var p = resp.payload;
209
M src/json_tag.c
+4
--- src/json_tag.c
+++ src/json_tag.c
@@ -316,10 +316,14 @@
316316
 }
317317
318318
319319
 /*
320320
 ** Impl for /json/tag/list
321
+**
322
+** TODOs:
323
+**
324
+** Add -type TYPE (ci, w, e, t)
321325
 */
322326
 static cson_value * json_tag_list(){
323327
 cson_value * payV = NULL;
324328
 cson_object * pay = NULL;
325329
 cson_value const * tagsVal = NULL;
326330
--- src/json_tag.c
+++ src/json_tag.c
@@ -316,10 +316,14 @@
316 }
317
318
319 /*
320 ** Impl for /json/tag/list
 
 
 
 
321 */
322 static cson_value * json_tag_list(){
323 cson_value * payV = NULL;
324 cson_object * pay = NULL;
325 cson_value const * tagsVal = NULL;
326
--- src/json_tag.c
+++ src/json_tag.c
@@ -316,10 +316,14 @@
316 }
317
318
319 /*
320 ** Impl for /json/tag/list
321 **
322 ** TODOs:
323 **
324 ** Add -type TYPE (ci, w, e, t)
325 */
326 static cson_value * json_tag_list(){
327 cson_value * payV = NULL;
328 cson_object * pay = NULL;
329 cson_value const * tagsVal = NULL;
330
M src/json_wiki.c
+9 -4
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -159,23 +159,28 @@
159159
 if( !g.perm.RdWiki && !g.perm.Read ){
160160
 json_set_err(FSL_JSON_E_DENIED,
161161
 "Requires 'o' or 'j' access.");
162162
 return NULL;
163163
 }
164
- if(fossil_is_json()){
165
- zPageName = json_getenv_cstr("page");
164
+ zPageName = json_find_option_cstr("name",NULL,"n")
165
+ /* Damn... fossil automatically sets name to the PATH
166
+ part after /json, so we need a workaround down here....
167
+ */
168
+ ;
169
+ if( zPageName && (NULL != strstr(zPageName, "/"))){
170
+ /* Assume that we picked up a path remnant. */
171
+ zPageName = NULL;
166172
 }
167
- zPageName = json_find_option_cstr("page",NULL,"p");
168173
 if( !zPageName && cson_value_is_string(g.json.reqPayload.v) ){
169174
 zPageName = cson_string_cstr(cson_value_get_string(g.json.reqPayload.v));
170175
 }
171176
 if(!zPageName){
172177
 zPageName = json_command_arg(g.json.dispatchDepth+1);
173178
 }
174179
 if(!zPageName||!*zPageName){
175180
 json_set_err(FSL_JSON_E_MISSING_ARGS,
176
- "'page' argument is missing.");
181
+ "'name' argument is missing.");
177182
 return NULL;
178183
 }
179184
180185
 zFormat = json_find_option_cstr("format",NULL,"f");
181186
 if(!zFormat || !*zFormat){
182187
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -159,23 +159,28 @@
159 if( !g.perm.RdWiki && !g.perm.Read ){
160 json_set_err(FSL_JSON_E_DENIED,
161 "Requires 'o' or 'j' access.");
162 return NULL;
163 }
164 if(fossil_is_json()){
165 zPageName = json_getenv_cstr("page");
 
 
 
 
 
 
166 }
167 zPageName = json_find_option_cstr("page",NULL,"p");
168 if( !zPageName && cson_value_is_string(g.json.reqPayload.v) ){
169 zPageName = cson_string_cstr(cson_value_get_string(g.json.reqPayload.v));
170 }
171 if(!zPageName){
172 zPageName = json_command_arg(g.json.dispatchDepth+1);
173 }
174 if(!zPageName||!*zPageName){
175 json_set_err(FSL_JSON_E_MISSING_ARGS,
176 "'page' argument is missing.");
177 return NULL;
178 }
179
180 zFormat = json_find_option_cstr("format",NULL,"f");
181 if(!zFormat || !*zFormat){
182
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -159,23 +159,28 @@
159 if( !g.perm.RdWiki && !g.perm.Read ){
160 json_set_err(FSL_JSON_E_DENIED,
161 "Requires 'o' or 'j' access.");
162 return NULL;
163 }
164 zPageName = json_find_option_cstr("name",NULL,"n")
165 /* Damn... fossil automatically sets name to the PATH
166 part after /json, so we need a workaround down here....
167 */
168 ;
169 if( zPageName && (NULL != strstr(zPageName, "/"))){
170 /* Assume that we picked up a path remnant. */
171 zPageName = NULL;
172 }
 
173 if( !zPageName && cson_value_is_string(g.json.reqPayload.v) ){
174 zPageName = cson_string_cstr(cson_value_get_string(g.json.reqPayload.v));
175 }
176 if(!zPageName){
177 zPageName = json_command_arg(g.json.dispatchDepth+1);
178 }
179 if(!zPageName||!*zPageName){
180 json_set_err(FSL_JSON_E_MISSING_ARGS,
181 "'name' argument is missing.");
182 return NULL;
183 }
184
185 zFormat = json_find_option_cstr("format",NULL,"f");
186 if(!zFormat || !*zFormat){
187

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button