diff gengetopt.in @ 277:abfb26e08d9c audiodb-debian

Merge trunk changes -r326:386 into audiodb-debian branch.

Plus new debian/changelog version.  (Should have used an epoch really,
but couldn't be bothered; TODO: work out a sane version numbering
policy).

--- a/gengetopt.in	Mon Dec 17 16:44:37 2007 +0000
+++ b/gengetopt.in	Tue Jul 01 09:12:40 2008 +0000
@@ -5,11 +5,20 @@
 option "verbosity" v "level of detail of operational information." int typestr="detail" default="1" optional
 text "\nDatabase commands are UPPER CASE. Command options are lower case.\n" 
 text ""
-section "Database Setup" sectiondesc="All database operations require a database argument."
+section "Database Operations" sectiondesc="All database operations require a database argument."
 
 option "database" d "database file required by Database commands." string typestr="filename" optional
+
+section "Database Creation" sectiondesc="Creating a new database file."
+
 option "NEW"    N "make a new (initially empty) database." dependon="database" optional
-option "size"   - "size of database file (in MB)" int dependon="NEW" default="2000" optional
+option "size"   - "size of database file (in MB)" int dependon="NEW" optional hidden
+option "datasize" - "size of data table requested (in MB)" int dependon="NEW" default="1355" optional
+option "ntracks" - "capacity of database for tracks" int dependon="NEW" default="20000" optional
+option "datadim" - "dimensionality of stored data" int dependon="NEW" default="9" optional
+
+section "Database Maintenance" sectiondesc="Querying, tweaking and dumping databases."
+
 option "STATUS" S "output database information to stdout." dependon="database" optional
 option "DUMP"   D "output all entries: index key size." dependon="database" optional
 option "output" - "output directory" string dependon="DUMP" default="audioDB.dump" optional
@@ -33,7 +42,7 @@
 
 section "Database Search" sectiondesc="Thse commands control the retrieval behaviour.\n"
 
-option "QUERY" Q "content-based search on --database using --features as a query. Optionally restrict the search to those tracks identified in a --keyList." values="point","track","sequence" typestr="searchtype" dependon="database" dependon="features" optional
+option "QUERY" Q "content-based search on --database using --features as a query. Optionally restrict the search to those tracks identified in a --keyList." values="point","track","sequence","nsequence","onetoonensequence" typestr="searchtype" dependon="database" dependon="features" optional
 option "qpoint" p "ordinal position of query start point in --features file." int typestr="position" default="0" optional
 option "exhaustive" e "exhaustive search: iterate through all query vectors in search. Overrides --qpoint." flag off optional hidden
 option "pointnn" n "number of point nearest neighbours to use in retrieval." int typestr="numpoints" default="10" optional