# HG changeset patch # User mas01cr # Date 1227519515 0 # Node ID 4ded52b104e68812b9851b73e5eb7cedda96fb16 # Parent 4e68f7d4d524152f07d4c2d5e55d7122f78f2f1d Move "liszt" command into its own file. diff -r 4e68f7d4d524 -r 4ded52b104e6 Makefile --- a/Makefile Fri Nov 21 15:22:15 2008 +0000 +++ b/Makefile Mon Nov 24 09:38:35 2008 +0000 @@ -10,7 +10,7 @@ -LIBOBJS=insert.o create.o common.o dump.o query.o sample.o index.o lshlib.o cmdline.o +LIBOBJS=insert.o create.o common.o dump.o liszt.o query.o sample.o index.o lshlib.o cmdline.o OBJS=$(LIBOBJS) soap.o audioDB.o diff -r 4e68f7d4d524 -r 4ded52b104e6 dump.cpp --- a/dump.cpp Fri Nov 21 15:22:15 2008 +0000 +++ b/dump.cpp Mon Nov 24 09:38:35 2008 +0000 @@ -202,36 +202,3 @@ status(dbName); } - -void audioDB::liszt(const char* dbName, unsigned offset, unsigned numLines, adb__lisztResponse* adbLisztResponse){ - if(!dbH) { - initTables(dbName, 0); - } - - assert(trackTable && fileTable); - - if(offset>dbH->numFiles){ - char tmpStr[MAXSTR]; - sprintf(tmpStr, "numFiles=%u, lisztOffset=%u", dbH->numFiles, offset); - error("listKeys offset out of range", tmpStr); - } - - if(!adbLisztResponse){ - for(Uns32T k=0; knumFiles; k++){ - fprintf(stdout, "[%d] %s (%d)\n", offset+k, fileTable+(offset+k)*O2_FILETABLE_ENTRY_SIZE, trackTable[offset+k]); - } - } - else{ - adbLisztResponse->result.Rkey = new char*[numLines]; - adbLisztResponse->result.Rlen = new unsigned int[numLines]; - Uns32T k = 0; - for( ; knumFiles; k++){ - adbLisztResponse->result.Rkey[k] = new char[MAXSTR]; - snprintf(adbLisztResponse->result.Rkey[k], O2_MAXFILESTR, "%s", fileTable+(offset+k)*O2_FILETABLE_ENTRY_SIZE); - adbLisztResponse->result.Rlen[k] = trackTable[offset+k]; - } - adbLisztResponse->result.__sizeRkey = k; - adbLisztResponse->result.__sizeRlen = k; - } - -} diff -r 4e68f7d4d524 -r 4ded52b104e6 liszt.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/liszt.cpp Mon Nov 24 09:38:35 2008 +0000 @@ -0,0 +1,34 @@ +#include "audioDB.h" + +void audioDB::liszt(const char* dbName, unsigned offset, unsigned numLines, adb__lisztResponse* adbLisztResponse){ + if(!dbH) { + initTables(dbName, 0); + } + + assert(trackTable && fileTable); + + if(offset>dbH->numFiles){ + char tmpStr[MAXSTR]; + sprintf(tmpStr, "numFiles=%u, lisztOffset=%u", dbH->numFiles, offset); + error("listKeys offset out of range", tmpStr); + } + + if(!adbLisztResponse){ + for(Uns32T k=0; knumFiles; k++){ + fprintf(stdout, "[%d] %s (%d)\n", offset+k, fileTable+(offset+k)*O2_FILETABLE_ENTRY_SIZE, trackTable[offset+k]); + } + } + else{ + adbLisztResponse->result.Rkey = new char*[numLines]; + adbLisztResponse->result.Rlen = new unsigned int[numLines]; + Uns32T k = 0; + for( ; knumFiles; k++){ + adbLisztResponse->result.Rkey[k] = new char[MAXSTR]; + snprintf(adbLisztResponse->result.Rkey[k], O2_MAXFILESTR, "%s", fileTable+(offset+k)*O2_FILETABLE_ENTRY_SIZE); + adbLisztResponse->result.Rlen[k] = trackTable[offset+k]; + } + adbLisztResponse->result.__sizeRkey = k; + adbLisztResponse->result.__sizeRlen = k; + } + +}