Fossil SCM
Re-implemented json_artifact_wiki() to use pre-existing functionality.
Commit
f996e6636c11a9036e3acfbd6f5c0a0211baf083
Parent
d2c1ae23a90b24f…
1 file changed
+1
-20
+1
-20
| --- src/json_artifact.c | ||
| +++ src/json_artifact.c | ||
| @@ -212,30 +212,11 @@ | ||
| 212 | 212 | /* Final entry MUST have a NULL name. */ |
| 213 | 213 | {NULL,NULL} |
| 214 | 214 | }; |
| 215 | 215 | |
| 216 | 216 | cson_value * json_artifact_wiki(int rid){ |
| 217 | - Manifest *pWiki = 0; | |
| 218 | - char *zBody = NULL; | |
| 219 | - char const *zPageName = NULL; | |
| 220 | - cson_value * payV = NULL; | |
| 221 | - cson_object * pay = NULL; | |
| 222 | - | |
| 223 | - payV = cson_value_new_object(); | |
| 224 | - pay = cson_value_get_object(payV); | |
| 225 | - | |
| 226 | - zPageName = db_text(0, "SELECT tagname FROM tag" | |
| 227 | - " WHERE tagid=(SELECT tagid FROM tagxref WHERE rid=%d)", rid); | |
| 228 | - | |
| 229 | - pWiki = manifest_get(rid, CFTYPE_WIKI); | |
| 230 | - if( pWiki ){ | |
| 231 | - zBody = pWiki->zWiki; | |
| 232 | - } | |
| 233 | - | |
| 234 | - cson_object_set(pay, "name", json_new_string(zPageName)); | |
| 235 | - cson_object_set(pay, "body", json_new_string(zBody)); | |
| 236 | - return payV; | |
| 217 | + return json_get_wiki_page_by_rid(rid, 0); | |
| 237 | 218 | } |
| 238 | 219 | |
| 239 | 220 | cson_value * json_artifact_file(int rid){ |
| 240 | 221 | cson_value * payV = NULL; |
| 241 | 222 | cson_object * pay = NULL; |
| 242 | 223 |
| --- src/json_artifact.c | |
| +++ src/json_artifact.c | |
| @@ -212,30 +212,11 @@ | |
| 212 | /* Final entry MUST have a NULL name. */ |
| 213 | {NULL,NULL} |
| 214 | }; |
| 215 | |
| 216 | cson_value * json_artifact_wiki(int rid){ |
| 217 | Manifest *pWiki = 0; |
| 218 | char *zBody = NULL; |
| 219 | char const *zPageName = NULL; |
| 220 | cson_value * payV = NULL; |
| 221 | cson_object * pay = NULL; |
| 222 | |
| 223 | payV = cson_value_new_object(); |
| 224 | pay = cson_value_get_object(payV); |
| 225 | |
| 226 | zPageName = db_text(0, "SELECT tagname FROM tag" |
| 227 | " WHERE tagid=(SELECT tagid FROM tagxref WHERE rid=%d)", rid); |
| 228 | |
| 229 | pWiki = manifest_get(rid, CFTYPE_WIKI); |
| 230 | if( pWiki ){ |
| 231 | zBody = pWiki->zWiki; |
| 232 | } |
| 233 | |
| 234 | cson_object_set(pay, "name", json_new_string(zPageName)); |
| 235 | cson_object_set(pay, "body", json_new_string(zBody)); |
| 236 | return payV; |
| 237 | } |
| 238 | |
| 239 | cson_value * json_artifact_file(int rid){ |
| 240 | cson_value * payV = NULL; |
| 241 | cson_object * pay = NULL; |
| 242 |
| --- src/json_artifact.c | |
| +++ src/json_artifact.c | |
| @@ -212,30 +212,11 @@ | |
| 212 | /* Final entry MUST have a NULL name. */ |
| 213 | {NULL,NULL} |
| 214 | }; |
| 215 | |
| 216 | cson_value * json_artifact_wiki(int rid){ |
| 217 | return json_get_wiki_page_by_rid(rid, 0); |
| 218 | } |
| 219 | |
| 220 | cson_value * json_artifact_file(int rid){ |
| 221 | cson_value * payV = NULL; |
| 222 | cson_object * pay = NULL; |
| 223 |