bug 1140:

Added requiredfiles to EXTRA_DIST
Removed needless arguments

CEP/BB/ParmDB/src/ParmDBAIPS.cc

@@ -93,10 +93,10 @@ void ParmDBAIPS::createTables (const string& tableName)
   td.addColumn (ScalarColumnDesc<String>("TYPE"));
   td.addColumn (ScalarColumnDesc<String>("EXPRESSION"));
   td.addColumn (ArrayColumnDesc<double> ("CONSTANTS", 1));
-  td.addColumn (ScalarColumnDesc<double> ("STARTX", 1));
-  td.addColumn (ScalarColumnDesc<double> ("ENDX", 1));
-  td.addColumn (ScalarColumnDesc<double> ("STARTY", 1));
-  td.addColumn (ScalarColumnDesc<double> ("ENDY", 1));
+  td.addColumn (ScalarColumnDesc<double> ("STARTX"));
+  td.addColumn (ScalarColumnDesc<double> ("ENDX"));
+  td.addColumn (ScalarColumnDesc<double> ("STARTY"));
+  td.addColumn (ScalarColumnDesc<double> ("ENDY"));
   td.addColumn (ArrayColumnDesc<double> ("START", 1));
   td.addColumn (ArrayColumnDesc<double> ("END", 1));
   td.addColumn (ArrayColumnDesc <double>("VALUES"));
@@ -741,7 +741,7 @@ TableExprNode ParmDBAIPS::makeExpr (const Table& table,
       andExpr (expr,
 	       domain.getStart()[1] < table.col("ENDY")  &&
 	       domain.getEnd()[1]   > table.col("STARTY"));
-      if (domain.getStart().size() > 0) {
+      if (domain.getStart().size() > 2) {
 	andExpr (expr,
 	     nelements(table.col("START")) == int(domain.getStart().size())  &&
 	     all(fromVector(domain.getStart()) < table.col("END"))  &&

CEP/BB/ParmDB/test/Makefile.am

@@ -2,7 +2,6 @@ check_PROGRAMS        =
 
 # programs to run through supplied checktools
 CHECKTOOLPROGS        =
-#ENDCHECKTOOLPROGS
 
 # scripts used to run tests
 TESTSCRIPTS           = tparmdb.sh
@@ -13,7 +12,8 @@ TESTS	              = $(TESTSCRIPTS)
 XFAIL_TESTS           =
 
 # all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
-EXTRA_DIST            = $(TESTSCRIPTS)
+EXTRA_DIST            = $(TESTSCRIPTS) \
+			tparmdb.run tparmdb.in tparmdb.stdout
 
 # Lines to build a test program testprg
 #testprg_SOURCES		= testprg.cc
@@ -21,5 +21,4 @@ EXTRA_DIST            = $(TESTSCRIPTS)
 #testprg_DEPENDENCIES		= ../src/libparmtable.la $(LOFAR_DEPEND)
 
 
-
 include $(top_srcdir)/Makefile.common