From 744811d288c572a1605bc5bd457051b0219ef6f1 Mon Sep 17 00:00:00 2001
From: Pierre Alexandre Tremblay <info@pierrealexandretremblay.com>
Date: Fri, 17 Jul 2020 17:40:00 +0100
Subject: [PATCH] corrected clear in datasetquery and made the help a bit more
 verbose

---
 .../Classes/FluidDataSetQuery.sc              |  4 +--
 .../Classes/FluidDataSetQuery.schelp          | 34 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/release-packaging/Classes/FluidDataSetQuery.sc b/release-packaging/Classes/FluidDataSetQuery.sc
index 4771c99..fa16da4 100644
--- a/release-packaging/Classes/FluidDataSetQuery.sc
+++ b/release-packaging/Classes/FluidDataSetQuery.sc
@@ -33,8 +33,8 @@ FluidDataSetQuery : FluidManipulationClient {
 		this.prSendMsg(\or, [column, condition, value], action);
 	}
 
-	reset{|action|
-		this.prSendMsg(\reset, [], action);
+	clear{|action|
+		this.prSendMsg(\clear, [], action);
 	}
 
 	limit{|rows, action|
diff --git a/release-packaging/HelpSource/Classes/FluidDataSetQuery.schelp b/release-packaging/HelpSource/Classes/FluidDataSetQuery.schelp
index 050f419..1d8e57b 100644
--- a/release-packaging/HelpSource/Classes/FluidDataSetQuery.schelp
+++ b/release-packaging/HelpSource/Classes/FluidDataSetQuery.schelp
@@ -77,7 +77,7 @@ Maximum number of rows
 ARGUMENT:: action
 Run when done
 
-METHOD:: reset
+METHOD:: clear
 Clear the query, remove all columns, filters and limit.
 ARGUMENT:: action
 Run when done
@@ -103,9 +103,9 @@ s.boot;
 ~dataSet= FluidDataSet(s,\help_fluid_dataset_query);
 
 (
-~points = 100.collect{24.collect{100.rand}};
+~points = 100.collect{|i|5.collect{|j|j+(i/100)}};
 ~dataSet.clear;
-~tmpbuf = Buffer.alloc(s,24);
+~tmpbuf = Buffer.alloc(s,5);
 
 fork{
     s.sync;
@@ -117,24 +117,30 @@ fork{
 }
 )
 
+//check the source
+~dataSet.print;
+
 // Prepare a FluidDataSetQuery object
 ~query = FluidDataSetQuery.new;
-~query.reset;
-~query.addColumn(5);
-~query.addRange(0,2);
+~out = FluidDataSet(s,\help_fluid_dataset_query_out);
 
-~query.filter(0,"<",50);
-~query.and(1,"<",50);
-~query.and(2,"<",50);
-~query.limit(10);
+// prepare a simple query
+~query.filter(0,"<",0.04);
+~query.addColumn(2);
+~query.transform(~dataSet, ~out);
 
-// Create an output DataSet and run the query
-~out = FluidDataSet(s,\help_fluid_dataset_query_out);
+// check the result
+~out.print;
+
+//prepare a more complex query
+~query.clear;
+~query.filter(0,">",0.03);
+~query.and(1,"<",1.08);
+~query.or(2,">",2.98);
+~query.addRange(1,2);
 ~query.transform(~dataSet, ~out);
 
 // Check the results
-~dataSet.print;
 ~out.print;
 
-
 ::