# HG changeset patch
# User mas01cr
# Date 1231881986 0
# Node ID da4b76190d43b3d1b2fc0fa7a4a0f45672e802a8
# Parent  3d17fdac096ae5c95045eee97577437f50adab28
Remove vestiges of old allowed_keys implementation of restrict list

Completely superseded by qspec.refine.include/exclude.

diff -r 3d17fdac096a -r da4b76190d43 audioDB.cpp
--- a/audioDB.cpp	Tue Jan 13 21:26:21 2009 +0000
+++ b/audioDB.cpp	Tue Jan 13 21:26:26 2009 +0000
@@ -151,8 +151,6 @@
     munmap(powerFileNameTable, fileTableLength);
   if(reporter)
     delete reporter;
-  if(allowed_keys)
-    delete allowed_keys;
   if(rng)
     gsl_rng_free(rng);
   if(infid>0)
diff -r 3d17fdac096a -r da4b76190d43 audioDB.h
--- a/audioDB.h	Tue Jan 13 21:26:21 2009 +0000
+++ b/audioDB.h	Tue Jan 13 21:26:26 2009 +0000
@@ -292,7 +292,6 @@
   double relative_threshold;
   
   ReporterBase* reporter;  // track/point reporter
-  set<Uns32T> * allowed_keys;    // search restrict list by key
 
   // LISZT parameters
   unsigned lisztOffset;
@@ -354,8 +353,6 @@
   Uns32T index_insert_shingles(vector<vector<float> >*, Uns32T trackID, double* spp);
   void insertPowerData(unsigned n, int powerfd, double *powerdata);
   void init_track_aux_data(Uns32T trackID, double* fvp, double** sNormpp,double** snPtrp, double** sPowerp, double** spPtrp);
-  void initialize_allowed_keys(std::ifstream*); // implementation of restrict lists using STL "set" class
-  int is_in_allowed_keys(Uns32T trackID); // test method for allowed_keys used during search
   
   // Web Services
   void startServer();
@@ -431,7 +428,6 @@
     use_relative_threshold(false),		\
     relative_threshold(0.0),			\
     reporter(0),                                \
-    allowed_keys(0),                            \
     lisztOffset(0),                             \
     lisztLength(0),                             \
     lsh(0),					\