Fossil SCM

minor cleanups to /json/dir.

stephan 2012-03-16 15:51 trunk

Commit 726a6f7942385e07b279bee94be06ce0301b0c1d

Parent 318a0ac13225155…

1 file changed +10 -6

M src/json_dir.c

+10 -6

		--- src/json_dir.c
		+++ src/json_dir.c
		@@ -47,10 +47,11 @@
47	47	** Impl of /json/dir. 98% of it was taken directly
48	48	** from browse.c::page_dir()
49	49	*/
50	50	static cson_value * json_page_dir_list(){
51	51	cson_object * zPayload = NULL;
	52	+ cson_array * zEntries = NULL;
52	53	cson_array * zFiles = NULL;
53	54	cson_array * zDirs = NULL;
54	55	cson_object * zEntry = NULL;
55	56	cson_string * zKeyName = NULL;
56	57	cson_string * zKeyIsDir = NULL;
		@@ -183,10 +184,11 @@
183	184	cson_object_set_s( zPayload, zKeyUuid, cson_string_value(cson_new_string(zUuid, strlen(zUuid))) );
184	185	}
185	186	if( zCI ) cson_object_set( zPayload, "checkin", json_new_string(zCI) );
186	187
187	188	while( (SQLITE_ROW==db_step(&q)) ){
	189	+ cson_value * name = NULL;
188	190	char const * n = db_column_text(&q,0);
189	191	char const * u = zCI ? db_column_text(&q,1) : NULL;
190	192	zEntry = cson_new_object();
191	193	#if 0
192	194	if('/'==*n){
		@@ -206,24 +208,26 @@
206	208	}
207	209	if(u && *u){
208	210	cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );
209	211	}
210	212	#else
211		- if(!zFiles){
212		- zFiles = cson_new_array();
213		- cson_object_set( zPayload, "entries", cson_array_value(zFiles) );
	213	+ if(!zEntries){
	214	+ zEntries = cson_new_array();
	215	+ cson_object_set( zPayload, "entries", cson_array_value(zEntries) );
214	216	}
215		- cson_array_append(zFiles, cson_object_value(zEntry) );
216	217	if('/'==*n){
217		- cson_object_set_s(zEntry, zKeyName, json_new_string( n+1 ) );
	218	+ name = json_new_string( n+1 );
218	219	cson_object_set_s(zEntry, zKeyIsDir, cson_value_true() );
	220	+
219	221	} else{
220		- cson_object_set_s(zEntry, zKeyName, json_new_string( n ) );
	222	+ name = json_new_string( n );
221	223	}
222	224	if(u && *u){
223	225	cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );
224	226	}
	227	+ cson_object_set_s(zEntry, zKeyName, name );
	228	+ cson_array_append(zEntries, cson_object_value(zEntry) );
225	229	#endif
226	230	}
227	231	db_finalize(&q);
228	232	if(pM){
229	233	manifest_destroy(pM);
230	234

	--- src/json_dir.c
	+++ src/json_dir.c
	@@ -47,10 +47,11 @@
47	** Impl of /json/dir. 98% of it was taken directly
48	** from browse.c::page_dir()
49	*/
50	static cson_value * json_page_dir_list(){
51	cson_object * zPayload = NULL;

52	cson_array * zFiles = NULL;
53	cson_array * zDirs = NULL;
54	cson_object * zEntry = NULL;
55	cson_string * zKeyName = NULL;
56	cson_string * zKeyIsDir = NULL;
	@@ -183,10 +184,11 @@
183	cson_object_set_s( zPayload, zKeyUuid, cson_string_value(cson_new_string(zUuid, strlen(zUuid))) );
184	}
185	if( zCI ) cson_object_set( zPayload, "checkin", json_new_string(zCI) );
186
187	while( (SQLITE_ROW==db_step(&q)) ){

188	char const * n = db_column_text(&q,0);
189	char const * u = zCI ? db_column_text(&q,1) : NULL;
190	zEntry = cson_new_object();
191	#if 0
192	if('/'==*n){
	@@ -206,24 +208,26 @@
206	}
207	if(u && *u){
208	cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );
209	}
210	#else
211	if(!zFiles){
212	zFiles = cson_new_array();
213	cson_object_set( zPayload, "entries", cson_array_value(zFiles) );
214	}
215	cson_array_append(zFiles, cson_object_value(zEntry) );
216	if('/'==*n){
217	cson_object_set_s(zEntry, zKeyName, json_new_string( n+1 ) );
218	cson_object_set_s(zEntry, zKeyIsDir, cson_value_true() );

219	} else{
220	cson_object_set_s(zEntry, zKeyName, json_new_string( n ) );
221	}
222	if(u && *u){
223	cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );
224	}


225	#endif
226	}
227	db_finalize(&q);
228	if(pM){
229	manifest_destroy(pM);
230

	--- src/json_dir.c
	+++ src/json_dir.c
	@@ -47,10 +47,11 @@
47	** Impl of /json/dir. 98% of it was taken directly
48	** from browse.c::page_dir()
49	*/
50	static cson_value * json_page_dir_list(){
51	cson_object * zPayload = NULL;
52	cson_array * zEntries = NULL;
53	cson_array * zFiles = NULL;
54	cson_array * zDirs = NULL;
55	cson_object * zEntry = NULL;
56	cson_string * zKeyName = NULL;
57	cson_string * zKeyIsDir = NULL;
	@@ -183,10 +184,11 @@
184	cson_object_set_s( zPayload, zKeyUuid, cson_string_value(cson_new_string(zUuid, strlen(zUuid))) );
185	}
186	if( zCI ) cson_object_set( zPayload, "checkin", json_new_string(zCI) );
187
188	while( (SQLITE_ROW==db_step(&q)) ){
189	cson_value * name = NULL;
190	char const * n = db_column_text(&q,0);
191	char const * u = zCI ? db_column_text(&q,1) : NULL;
192	zEntry = cson_new_object();
193	#if 0
194	if('/'==*n){
	@@ -206,24 +208,26 @@
208	}
209	if(u && *u){
210	cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );
211	}
212	#else
213	if(!zEntries){
214	zEntries = cson_new_array();
215	cson_object_set( zPayload, "entries", cson_array_value(zEntries) );
216	}

217	if('/'==*n){
218	name = json_new_string( n+1 );
219	cson_object_set_s(zEntry, zKeyIsDir, cson_value_true() );
220
221	} else{
222	name = json_new_string( n );
223	}
224	if(u && *u){
225	cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );
226	}
227	cson_object_set_s(zEntry, zKeyName, name );
228	cson_array_append(zEntries, cson_object_value(zEntry) );
229	#endif
230	}
231	db_finalize(&q);
232	if(pM){
233	manifest_destroy(pM);
234

Fossil SCM

Keyboard Shortcuts