ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-24 21:09:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-order "rhizome list" columns

Browse Source
This commit is contained in:
Andrew Bettison 2012-05-25 18:06:48 +09:30
parent f91ed16f9b
commit 62ae488c18
2 changed files with 8 additions and 8 deletions

12
rhizome_database.c

@ -592,12 +592,12 @@ int rhizome_list_manifests(const char *service, const char *sender_sid, const ch
size_t rows = 0;
cli_puts("8"); cli_delim("\n"); // number of columns
cli_puts("service"); cli_delim(":");
cli_puts("fileid"); cli_delim(":");
cli_puts("manifestid"); cli_delim(":");
cli_puts("id"); cli_delim(":");
cli_puts("version"); cli_delim(":");
cli_puts("inserttime"); cli_delim(":");
cli_puts("length"); cli_delim(":");
cli_puts("date"); cli_delim(":");
cli_puts("_inserttime"); cli_delim(":");
cli_puts("filesize"); cli_delim(":");
cli_puts("filehash"); cli_delim(":");
cli_puts("name"); cli_delim("\n");
while (sqlite3_step(statement) == SQLITE_ROW) {
++rows;
@ -646,12 +646,12 @@ int rhizome_list_manifests(const char *service, const char *sender_sid, const ch
const char *blob_filehash = rhizome_manifest_get(m, "filehash", NULL, 0);
long long blob_filesize = rhizome_manifest_get_ll(m, "filesize");
cli_puts(blob_service ? blob_service : ""); cli_delim(":");
cli_puts(blob_filehash ? blob_filehash : ""); cli_delim(":");
cli_puts(q_manifestid); cli_delim(":");
cli_printf("%lld", blob_version); cli_delim(":");
cli_printf("%lld", blob_date); cli_delim(":");
cli_printf("%lld", q_inserttime); cli_delim(":");
cli_printf("%u", blob_filesize); cli_delim(":");
cli_printf("%lld", blob_date); cli_delim(":");
cli_puts(blob_filehash ? blob_filehash : ""); cli_delim(":");
cli_puts(blob_name ? blob_name : ""); cli_delim("\n");
}
}

4
tests/dna_rhizome

@ -42,11 +42,11 @@ setup_servald_rhizome() {
assert_rhizome_list() {
assertStdoutLineCount '==' $(($# + 2))
assertStdoutIs --line=1 -e '8\n'
assertStdoutIs --line=2 -e 'service:fileid:manifestid:version:inserttime:length:date:name\n'
assertStdoutIs --line=2 -e 'service:id:version:date:_inserttime:filesize:filehash:name\n'
local filename
for filename; do
unpack_manifest_for_grep "$filename"
assertStdoutGrep --matches=1 "^$re_service:$re_filehash:$re_manifestid:.*:$re_name\$"
assertStdoutGrep --matches=1 "^$re_service:$re_manifestid:.*:$re_filehash:$re_name\$"
done
}