Fossil SCM
Restructure /json/settings/get output from an array of objects to a map of objects, keyed on setting name, per forum discussion.
Commit
d0bf9682a91eaedd2f29ff84e3b4113b13bf8cabb935f1322e942e75e4b92a5c
Parent
451cda04522e59d…
1 file changed
+3
-4
+3
-4
| --- src/json_config.c | ||
| +++ src/json_config.c | ||
| @@ -208,11 +208,11 @@ | ||
| 208 | 208 | |
| 209 | 209 | /* |
| 210 | 210 | ** Impl of /json/settings/get. |
| 211 | 211 | */ |
| 212 | 212 | static cson_value * json_settings_get(void){ |
| 213 | - cson_array * pay = cson_new_array(); /* output payload */ | |
| 213 | + cson_object * pay = cson_new_object(); /* output payload */ | |
| 214 | 214 | int nSetting, i; /* setting count and loop var */ |
| 215 | 215 | const Setting *aSetting = setting_info(&nSetting); |
| 216 | 216 | const char * zRevision = 0; /* revision to look for |
| 217 | 217 | versioned settings in */ |
| 218 | 218 | char * zUuid = 0; /* Resolved UUID of zRevision */ |
| @@ -254,12 +254,11 @@ | ||
| 254 | 254 | for(i=0; i<nSetting; ++i){ |
| 255 | 255 | const Setting *pSet = &aSetting[i]; |
| 256 | 256 | cson_object * jSet; |
| 257 | 257 | cson_value * pVal = 0, * pSrc = 0; |
| 258 | 258 | jSet = cson_new_object(); |
| 259 | - cson_array_append(pay, cson_object_value(jSet)); | |
| 260 | - cson_object_set(jSet, "name", json_new_string(pSet->name)); | |
| 259 | + cson_object_set(pay, pSet->name, cson_object_value(jSet)); | |
| 261 | 260 | cson_object_set(jSet, "versionable", cson_value_new_bool(pSet->versionable)); |
| 262 | 261 | cson_object_set(jSet, "sensitive", cson_value_new_bool(pSet->sensitive)); |
| 263 | 262 | cson_object_set(jSet, "defaultValue", (pSet->def && pSet->def[0]) |
| 264 | 263 | ? json_new_string(pSet->def) |
| 265 | 264 | : cson_value_null()); |
| @@ -314,9 +313,9 @@ | ||
| 314 | 313 | cson_object_set(jSet, "value", pVal ? pVal : cson_value_null()); |
| 315 | 314 | }/*aSetting loop*/ |
| 316 | 315 | db_finalize(&q); |
| 317 | 316 | db_finalize(&qFoci); |
| 318 | 317 | fossil_free(zUuid); |
| 319 | - return cson_array_value(pay); | |
| 318 | + return cson_object_value(pay); | |
| 320 | 319 | } |
| 321 | 320 | |
| 322 | 321 | #endif /* FOSSIL_ENABLE_JSON */ |
| 323 | 322 |
| --- src/json_config.c | |
| +++ src/json_config.c | |
| @@ -208,11 +208,11 @@ | |
| 208 | |
| 209 | /* |
| 210 | ** Impl of /json/settings/get. |
| 211 | */ |
| 212 | static cson_value * json_settings_get(void){ |
| 213 | cson_array * pay = cson_new_array(); /* output payload */ |
| 214 | int nSetting, i; /* setting count and loop var */ |
| 215 | const Setting *aSetting = setting_info(&nSetting); |
| 216 | const char * zRevision = 0; /* revision to look for |
| 217 | versioned settings in */ |
| 218 | char * zUuid = 0; /* Resolved UUID of zRevision */ |
| @@ -254,12 +254,11 @@ | |
| 254 | for(i=0; i<nSetting; ++i){ |
| 255 | const Setting *pSet = &aSetting[i]; |
| 256 | cson_object * jSet; |
| 257 | cson_value * pVal = 0, * pSrc = 0; |
| 258 | jSet = cson_new_object(); |
| 259 | cson_array_append(pay, cson_object_value(jSet)); |
| 260 | cson_object_set(jSet, "name", json_new_string(pSet->name)); |
| 261 | cson_object_set(jSet, "versionable", cson_value_new_bool(pSet->versionable)); |
| 262 | cson_object_set(jSet, "sensitive", cson_value_new_bool(pSet->sensitive)); |
| 263 | cson_object_set(jSet, "defaultValue", (pSet->def && pSet->def[0]) |
| 264 | ? json_new_string(pSet->def) |
| 265 | : cson_value_null()); |
| @@ -314,9 +313,9 @@ | |
| 314 | cson_object_set(jSet, "value", pVal ? pVal : cson_value_null()); |
| 315 | }/*aSetting loop*/ |
| 316 | db_finalize(&q); |
| 317 | db_finalize(&qFoci); |
| 318 | fossil_free(zUuid); |
| 319 | return cson_array_value(pay); |
| 320 | } |
| 321 | |
| 322 | #endif /* FOSSIL_ENABLE_JSON */ |
| 323 |
| --- src/json_config.c | |
| +++ src/json_config.c | |
| @@ -208,11 +208,11 @@ | |
| 208 | |
| 209 | /* |
| 210 | ** Impl of /json/settings/get. |
| 211 | */ |
| 212 | static cson_value * json_settings_get(void){ |
| 213 | cson_object * pay = cson_new_object(); /* output payload */ |
| 214 | int nSetting, i; /* setting count and loop var */ |
| 215 | const Setting *aSetting = setting_info(&nSetting); |
| 216 | const char * zRevision = 0; /* revision to look for |
| 217 | versioned settings in */ |
| 218 | char * zUuid = 0; /* Resolved UUID of zRevision */ |
| @@ -254,12 +254,11 @@ | |
| 254 | for(i=0; i<nSetting; ++i){ |
| 255 | const Setting *pSet = &aSetting[i]; |
| 256 | cson_object * jSet; |
| 257 | cson_value * pVal = 0, * pSrc = 0; |
| 258 | jSet = cson_new_object(); |
| 259 | cson_object_set(pay, pSet->name, cson_object_value(jSet)); |
| 260 | cson_object_set(jSet, "versionable", cson_value_new_bool(pSet->versionable)); |
| 261 | cson_object_set(jSet, "sensitive", cson_value_new_bool(pSet->sensitive)); |
| 262 | cson_object_set(jSet, "defaultValue", (pSet->def && pSet->def[0]) |
| 263 | ? json_new_string(pSet->def) |
| 264 | : cson_value_null()); |
| @@ -314,9 +313,9 @@ | |
| 313 | cson_object_set(jSet, "value", pVal ? pVal : cson_value_null()); |
| 314 | }/*aSetting loop*/ |
| 315 | db_finalize(&q); |
| 316 | db_finalize(&qFoci); |
| 317 | fossil_free(zUuid); |
| 318 | return cson_object_value(pay); |
| 319 | } |
| 320 | |
| 321 | #endif /* FOSSIL_ENABLE_JSON */ |
| 322 |