Mercurial > hg > audiodb

changeset 386:4ded52b104e6 api-inversion

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move "liszt" command into its own file.
author mas01cr
date Mon, 24 Nov 2008 09:38:35 +0000
parents 4e68f7d4d524
children 033051b7dc6f
files Makefile dump.cpp liszt.cpp
diffstat 3 files changed, 35 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- 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
 
 
--- 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; k<numLines && offset+k<dbH->numFiles; 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( ; k<numLines && offset+k<dbH->numFiles; 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;
-  }
-  
-}
--- /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; k<numLines && offset+k<dbH->numFiles; 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( ; k<numLines && offset+k<dbH->numFiles; 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;
+  }
+  
+}