Fossil SCM

added POST.payload to json_getenv() list. Re-organized /json/branch/list CLI/HTTP arg handling to behave sanely in CLI mode. Minor typo fix in main.c.

stephan 2011-09-21 19:31 json
Commit 4a9b51649d6499d33a5fa26fef31d068025d399d
Parent 267739dd20e2ea4…
2 files changed +66 -29 +1 -1
~ src/json.c ~ src/main.c
M src/json.c
+66 -29
--- src/json.c
+++ src/json.c
@@ -277,40 +277,50 @@
277277
 return cson_value_new_string( json_rc_cstr(code), 11 );
278278
 }
279279
280280
281281
 /*
282
-** Gets a POST/GET/COOKIE/ENV value. The returned memory is owned by the
283
-** g.json object (one of its sub-objects). Returns NULL if no match is
284
-** found.
282
+** Gets a POST/POST.payload/GET/COOKIE/ENV value. The returned memory
283
+** is owned by the g.json object (one of its sub-objects). Returns
284
+** NULL if no match is found.
285285
 **
286286
 ** ENV means the system environment (getenv()).
287287
 **
288
-** Precedence: GET, COOKIE, POST, ENV. COOKIE _should_ be after POST
289
-** but currently is not for internal order-of-init reasons. Since
290
-** fossil only uses one cookie, this is not a real/high-priority
291
-** problem.
288
+** Precedence: POST.payload, GET, COOKIE, POST, ENV.
289
+**
290
+** The precedence SHOULD be: GET, POST.payload, POST, COOKIE, ENV, but
291
+** the amalgamation of the GET/POST vars makes it difficult for me to
292
+** do that. Since fossil only uses one cookie, cookie precedence isn't
293
+** a real/high-priority problem.
292294
 */
293295
 cson_value * json_getenv( char const * zKey ){
294296
 cson_value * rc;
297
+ rc = g.json.reqPayload.o
298
+ ? cson_object_get( g.json.reqPayload.o, zKey )
299
+ : NULL;
300
+ if(rc){
301
+ return rc;
302
+ }
295303
 rc = cson_object_get( g.json.param.o, zKey );
296304
 if( rc ){
297305
 return rc;
298
- }else{
299
- rc = cson_object_get( g.json.post.o, zKey );
300
- if(rc){
301
- return rc;
302
- }else{
303
- char const * cv = PD(zKey,NULL);
304
- if(!cv){
305
- cv = getenv(zKey);
306
- }
307
- if(cv){/*transform it to JSON for later use.*/
308
- rc = cson_value_new_string(cv,strlen(cv));
309
- cson_object_set( g.json.param.o, zKey, rc );
310
- return rc;
311
- }
306
+ }
307
+ rc = cson_object_get( g.json.post.o, zKey );
308
+ if(rc){
309
+ return rc;
310
+ }else{
311
+ char const * cv = PD(zKey,NULL);
312
+ if(!cv){
313
+ cv = getenv(zKey);
314
+ }
315
+ if(cv){/*transform it to JSON for later use.*/
316
+ /* TODO: use sscanf() to figure out if it's an int,
317
+ and transform it to JSON int if it is.
318
+ */
319
+ rc = cson_value_new_string(cv,strlen(cv));
320
+ json_setenv( zKey, rc );
321
+ return rc;
312322
 }
313323
 }
314324
 return NULL;
315325
 }
316326
@@ -1563,26 +1573,50 @@
15631573
 ** Impl for /json/branch/list
15641574
 **
15651575
 ** TODO: change how the "range" of branches is specified.
15661576
 ** Take a string arg in the form ("open","all","closed")
15671577
 ** and decide based off of that.
1578
+**
1579
+**
1580
+** CLI mode options:
1581
+**
1582
+** --range X | -r X, where X is one of (open,closed,all)
1583
+** (only the first letter is significant, default=open).
1584
+** -a (same as --range a)
1585
+** -c (same as --range c)
1586
+**
1587
+** HTTP mode options:
1588
+**
1589
+** "range" GET/POST.payload parameter. FIXME: currently we also use
1590
+** POST, but really want to restrict this to POST.payload.
15681591
 */
15691592
 static cson_value * json_branch_list(unsigned int depth){
15701593
 cson_value * payV = cson_value_new_object();
15711594
 cson_object * pay = cson_value_get_object(payV);
15721595
 cson_value * listV = cson_value_new_array();
15731596
 cson_array * list = cson_value_get_array(listV);
15741597
 char const * range = NULL;
1575
- int showAll = json_getenv_int("all",0);
1576
- int showClosed = showAll ? 0 : json_getenv_int("closed",0);
15771598
 int which = 0;
15781599
 Stmt q;
1579
- range = json_getenv_cstr("range");
1600
+ if(!g.isHTTP){
1601
+ range = find_option("range","r",1);
1602
+ if(!range||!*range){
1603
+ range = find_option("all","a",0);
1604
+ if(range && *range){
1605
+ range = "a";
1606
+ }else{
1607
+ range = find_option("closed","c",0);
1608
+ if(range&&*range){
1609
+ range = "c";
1610
+ }
1611
+ }
1612
+ }
1613
+ }else{
1614
+ range = json_getenv_cstr("range");
1615
+ }
15801616
 if(!range || !*range){
1581
- range = showAll
1582
- ? "all"
1583
- : (showClosed?"closed":"open");
1617
+ range = "o";
15841618
 }
15851619
 assert( (NULL != range) && *range );
15861620
 switch(*range){
15871621
 case 'c':
15881622
 range = "closed";
@@ -1603,11 +1637,14 @@
16031637
 while((SQLITE_ROW==db_step(&q))){
16041638
 cson_value * v = cson_sqlite3_column_to_value(q.pStmt,0);
16051639
 if(v){
16061640
 cson_array_append(list,v);
16071641
 }else{
1608
- json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,NULL);
1642
+ char * msg = mprintf("Column-to-json failed @ %s:%d",
1643
+ __FILE__,__LINE__);
1644
+ json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,msg);
1645
+ free(msg);
16091646
 }
16101647
 }
16111648
 return payV;
16121649
 }
16131650
@@ -1687,11 +1724,11 @@
16871724
 ** /json/timeline/ci
16881725
 **
16891726
 ** Far from complete.
16901727
 */
16911728
 static cson_value * json_timeline_ci(unsigned int depth){
1692
- static const int defaultLimit = 10;
1729
+ static const int defaultLimit = 20;
16931730
 cson_value * payV = NULL;
16941731
 cson_object * pay = NULL;
16951732
 cson_value * tmp = NULL;
16961733
 cson_value * listV = NULL;
16971734
 cson_array * list = NULL;
16981735
--- src/json.c
+++ src/json.c
@@ -277,40 +277,50 @@
277 return cson_value_new_string( json_rc_cstr(code), 11 );
278 }
279
280
281 /*
282 ** Gets a POST/GET/COOKIE/ENV value. The returned memory is owned by the
283 ** g.json object (one of its sub-objects). Returns NULL if no match is
284 ** found.
285 **
286 ** ENV means the system environment (getenv()).
287 **
288 ** Precedence: GET, COOKIE, POST, ENV. COOKIE _should_ be after POST
289 ** but currently is not for internal order-of-init reasons. Since
290 ** fossil only uses one cookie, this is not a real/high-priority
291 ** problem.
 
 
292 */
293 cson_value * json_getenv( char const * zKey ){
294 cson_value * rc;
 
 
 
 
 
 
295 rc = cson_object_get( g.json.param.o, zKey );
296 if( rc ){
297 return rc;
298 }else{
299 rc = cson_object_get( g.json.post.o, zKey );
300 if(rc){
301 return rc;
302 }else{
303 char const * cv = PD(zKey,NULL);
304 if(!cv){
305 cv = getenv(zKey);
306 }
307 if(cv){/*transform it to JSON for later use.*/
308 rc = cson_value_new_string(cv,strlen(cv));
309 cson_object_set( g.json.param.o, zKey, rc );
310 return rc;
311 }
 
 
312 }
313 }
314 return NULL;
315 }
316
@@ -1563,26 +1573,50 @@
1563 ** Impl for /json/branch/list
1564 **
1565 ** TODO: change how the "range" of branches is specified.
1566 ** Take a string arg in the form ("open","all","closed")
1567 ** and decide based off of that.
 
 
 
 
 
 
 
 
 
 
 
 
 
1568 */
1569 static cson_value * json_branch_list(unsigned int depth){
1570 cson_value * payV = cson_value_new_object();
1571 cson_object * pay = cson_value_get_object(payV);
1572 cson_value * listV = cson_value_new_array();
1573 cson_array * list = cson_value_get_array(listV);
1574 char const * range = NULL;
1575 int showAll = json_getenv_int("all",0);
1576 int showClosed = showAll ? 0 : json_getenv_int("closed",0);
1577 int which = 0;
1578 Stmt q;
1579 range = json_getenv_cstr("range");
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1580 if(!range || !*range){
1581 range = showAll
1582 ? "all"
1583 : (showClosed?"closed":"open");
1584 }
1585 assert( (NULL != range) && *range );
1586 switch(*range){
1587 case 'c':
1588 range = "closed";
@@ -1603,11 +1637,14 @@
1603 while((SQLITE_ROW==db_step(&q))){
1604 cson_value * v = cson_sqlite3_column_to_value(q.pStmt,0);
1605 if(v){
1606 cson_array_append(list,v);
1607 }else{
1608 json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,NULL);
 
 
 
1609 }
1610 }
1611 return payV;
1612 }
1613
@@ -1687,11 +1724,11 @@
1687 ** /json/timeline/ci
1688 **
1689 ** Far from complete.
1690 */
1691 static cson_value * json_timeline_ci(unsigned int depth){
1692 static const int defaultLimit = 10;
1693 cson_value * payV = NULL;
1694 cson_object * pay = NULL;
1695 cson_value * tmp = NULL;
1696 cson_value * listV = NULL;
1697 cson_array * list = NULL;
1698
--- src/json.c
+++ src/json.c
@@ -277,40 +277,50 @@
277 return cson_value_new_string( json_rc_cstr(code), 11 );
278 }
279
280
281 /*
282 ** Gets a POST/POST.payload/GET/COOKIE/ENV value. The returned memory
283 ** is owned by the g.json object (one of its sub-objects). Returns
284 ** NULL if no match is found.
285 **
286 ** ENV means the system environment (getenv()).
287 **
288 ** Precedence: POST.payload, GET, COOKIE, POST, ENV.
289 **
290 ** The precedence SHOULD be: GET, POST.payload, POST, COOKIE, ENV, but
291 ** the amalgamation of the GET/POST vars makes it difficult for me to
292 ** do that. Since fossil only uses one cookie, cookie precedence isn't
293 ** a real/high-priority problem.
294 */
295 cson_value * json_getenv( char const * zKey ){
296 cson_value * rc;
297 rc = g.json.reqPayload.o
298 ? cson_object_get( g.json.reqPayload.o, zKey )
299 : NULL;
300 if(rc){
301 return rc;
302 }
303 rc = cson_object_get( g.json.param.o, zKey );
304 if( rc ){
305 return rc;
306 }
307 rc = cson_object_get( g.json.post.o, zKey );
308 if(rc){
309 return rc;
310 }else{
311 char const * cv = PD(zKey,NULL);
312 if(!cv){
313 cv = getenv(zKey);
314 }
315 if(cv){/*transform it to JSON for later use.*/
316 /* TODO: use sscanf() to figure out if it's an int,
317 and transform it to JSON int if it is.
318 */
319 rc = cson_value_new_string(cv,strlen(cv));
320 json_setenv( zKey, rc );
321 return rc;
322 }
323 }
324 return NULL;
325 }
326
@@ -1563,26 +1573,50 @@
1573 ** Impl for /json/branch/list
1574 **
1575 ** TODO: change how the "range" of branches is specified.
1576 ** Take a string arg in the form ("open","all","closed")
1577 ** and decide based off of that.
1578 **
1579 **
1580 ** CLI mode options:
1581 **
1582 ** --range X | -r X, where X is one of (open,closed,all)
1583 ** (only the first letter is significant, default=open).
1584 ** -a (same as --range a)
1585 ** -c (same as --range c)
1586 **
1587 ** HTTP mode options:
1588 **
1589 ** "range" GET/POST.payload parameter. FIXME: currently we also use
1590 ** POST, but really want to restrict this to POST.payload.
1591 */
1592 static cson_value * json_branch_list(unsigned int depth){
1593 cson_value * payV = cson_value_new_object();
1594 cson_object * pay = cson_value_get_object(payV);
1595 cson_value * listV = cson_value_new_array();
1596 cson_array * list = cson_value_get_array(listV);
1597 char const * range = NULL;
 
 
1598 int which = 0;
1599 Stmt q;
1600 if(!g.isHTTP){
1601 range = find_option("range","r",1);
1602 if(!range||!*range){
1603 range = find_option("all","a",0);
1604 if(range && *range){
1605 range = "a";
1606 }else{
1607 range = find_option("closed","c",0);
1608 if(range&&*range){
1609 range = "c";
1610 }
1611 }
1612 }
1613 }else{
1614 range = json_getenv_cstr("range");
1615 }
1616 if(!range || !*range){
1617 range = "o";
 
 
1618 }
1619 assert( (NULL != range) && *range );
1620 switch(*range){
1621 case 'c':
1622 range = "closed";
@@ -1603,11 +1637,14 @@
1637 while((SQLITE_ROW==db_step(&q))){
1638 cson_value * v = cson_sqlite3_column_to_value(q.pStmt,0);
1639 if(v){
1640 cson_array_append(list,v);
1641 }else{
1642 char * msg = mprintf("Column-to-json failed @ %s:%d",
1643 __FILE__,__LINE__);
1644 json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,msg);
1645 free(msg);
1646 }
1647 }
1648 return payV;
1649 }
1650
@@ -1687,11 +1724,11 @@
1724 ** /json/timeline/ci
1725 **
1726 ** Far from complete.
1727 */
1728 static cson_value * json_timeline_ci(unsigned int depth){
1729 static const int defaultLimit = 20;
1730 cson_value * payV = NULL;
1731 cson_object * pay = NULL;
1732 cson_value * tmp = NULL;
1733 cson_value * listV = NULL;
1734 cson_array * list = NULL;
1735
M src/main.c
+1 -1
--- src/main.c
+++ src/main.c
@@ -200,11 +200,11 @@
200200
 } cmd;
201201
 struct { /* JSON POST data. */
202202
 cson_value * v;
203203
 cson_object * o;
204204
 } post;
205
- struct { /* GET/COOKIE params in JSON form. */
205
+ struct { /* GET/COOKIE params in JSON mode. */
206206
 cson_value * v;
207207
 cson_object * o;
208208
 } param;
209209
 struct {
210210
 cson_value * v;
211211
--- src/main.c
+++ src/main.c
@@ -200,11 +200,11 @@
200 } cmd;
201 struct { /* JSON POST data. */
202 cson_value * v;
203 cson_object * o;
204 } post;
205 struct { /* GET/COOKIE params in JSON form. */
206 cson_value * v;
207 cson_object * o;
208 } param;
209 struct {
210 cson_value * v;
211
--- src/main.c
+++ src/main.c
@@ -200,11 +200,11 @@
200 } cmd;
201 struct { /* JSON POST data. */
202 cson_value * v;
203 cson_object * o;
204 } post;
205 struct { /* GET/COOKIE params in JSON mode. */
206 cson_value * v;
207 cson_object * o;
208 } param;
209 struct {
210 cson_value * v;
211

Keyboard Shortcuts

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