comparison audioDB.cpp @ 537:5da228727a2d

Removed obsolete dbH header pointer dereferences in audioDB.cpp. Replaced with the API adb->header type calls. The dbH calls were causing segfaults when attempting to index an empty database or during batch inserts in some rare cases.
author mas01mc
date Fri, 06 Feb 2009 17:08:21 +0000
parents c7bdb7913762
children e18843dc0aea
comparison
equal deleted inserted replaced
536:ad561daf75ca 537:5da228727a2d
735 if(audiodb_insert(adb, &insert)) { 735 if(audiodb_insert(adb, &insert)) {
736 error("insertion failure", thisFile); 736 error("insertion failure", thisFile);
737 } 737 }
738 } while(!filesIn->eof()); 738 } while(!filesIn->eof());
739 739
740 VERB_LOG(0, "%s %s %u vectors %ju bytes.\n", COM_BATCHINSERT, dbName, totalVectors, (intmax_t) (totalVectors * dbH->dim * sizeof(double))); 740 VERB_LOG(0, "%s %s %u vectors %ju bytes.\n", COM_BATCHINSERT, dbName, totalVectors, (intmax_t) (totalVectors * adb->header->dim * sizeof(double)));
741 741
742 delete [] thisPowerFileName; 742 delete [] thisPowerFileName;
743 if(key && (key != inFile)) { 743 if(key && (key != inFile)) {
744 delete [] thisKey; 744 delete [] thisKey;
745 } 745 }
910 qspec.params.npoints = 0; 910 qspec.params.npoints = 0;
911 qspec.params.ntracks = 0; 911 qspec.params.ntracks = 0;
912 if(!(qspec.refine.flags & ADB_REFINE_RADIUS)) { 912 if(!(qspec.refine.flags & ADB_REFINE_RADIUS)) {
913 error("query-type not yet supported"); 913 error("query-type not yet supported");
914 } else { 914 } else {
915 reporter = new trackSequenceQueryRadNNReporterOneToOne(pointNN,trackNN, dbH->numFiles); 915 reporter = new trackSequenceQueryRadNNReporterOneToOne(pointNN,trackNN, adb->header->numFiles);
916 } 916 }
917 break; 917 break;
918 default: 918 default:
919 error("unrecognized queryType"); 919 error("unrecognized queryType");
920 } 920 }