meadow-endpoints 2.0.12 → 3.0.0

package/.travis.yml

@@ -1,21 +0,0 @@
-language: node_js
-node_js:
-  - "8"
-  - "10"
-  - "12"
-  - "14"
-  - "15"
-services:
-  - mysql
-before_install:
-  - mysql -e 'CREATE DATABASE FableTest;'
-addons:
-  code_climate:
-    repo_token: b0b7492746ebd2075419cab324ea69ab4f444baeb687a1e4cad47e04216af7f6
-after_success:
-  - npm run coverage
-after_script:
-  - cat coverage/lcov.info | ./node_modules/codeclimate-test-reporter/bin/codeclimate.js
-  - cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
-notifications:
-  slack: paviateam:C1q99hL9XXpiPpau2PUrVZPC

package/0001-Don-t-call-response.send-on-huge-record-sets.-Use-JS.patch

@@ -1,209 +0,0 @@
-From 6a29bd206ef3b9dd8957c532dd8bc10b2c1789ac Mon Sep 17 00:00:00 2001
-From: Alex Decker <alex.decker@headlight.com>
-Date: Fri, 12 Nov 2021 23:31:24 -0800
-Subject: [PATCH 1/2] Don't call response.send on huge record sets. Use
- JSONStream instead, to avoid blocking the main thread.
-
----
- package.json                                  | 1 +
- source/crud/Meadow-Endpoint-BulkCreate.js     | 4 ++--
- source/crud/Meadow-Endpoint-BulkUpdate.js     | 4 ++--
- source/crud/Meadow-Endpoint-BulkUpsert.js     | 4 ++--
- source/crud/Meadow-Endpoint-ReadLiteList.js   | 5 +++--
- source/crud/Meadow-Endpoint-ReadSelectList.js | 5 +++--
- source/crud/Meadow-Endpoint-Reads.js          | 6 ++++--
- source/crud/Meadow-Endpoint-ReadsBy.js        | 5 +++--
- test/MeadowEndpoints_basic_tests.js           | 5 ++---
- 9 files changed, 22 insertions(+), 17 deletions(-)
-
-diff --git a/package.json b/package.json
-index b893e0c..b5bf05f 100644
---- a/package.json
-+++ b/package.json
-@@ -33,6 +33,7 @@
-   },
-   "dependencies": {
-     "async": "2.6.1",
-+    "JSONStream": "^1.3.5",
-     "meadow": "~1.0.30",
-     "mysql2": "1.6.1",
-     "orator": "~2.0.2",
-diff --git a/source/crud/Meadow-Endpoint-BulkCreate.js b/source/crud/Meadow-Endpoint-BulkCreate.js
-index 2858990..eb53ec6 100644
---- a/source/crud/Meadow-Endpoint-BulkCreate.js
-+++ b/source/crud/Meadow-Endpoint-BulkCreate.js
-@@ -13,6 +13,7 @@
- var libAsync = require('async');
- 
- var doCreate = require('./Meadow-Operation-Create.js');
-+const streamRecordsToResponse = require('./Meadow-StreamRecordArray');
- 
- var doAPIBulkCreateEndpoint = function(pRequest, pResponse, fNext)
- {
-@@ -50,8 +51,7 @@ var doAPIBulkCreateEndpoint = function(pRequest, pResponse, fNext)
- 			function(fStageComplete)
- 			{
- 				//5. Respond with the new records
--				pResponse.send(pRequest.CreatedRecords);
--				return fStageComplete(null);
-+				return streamRecordsToResponse(pResponse, pRequest.CreatedRecords, fStageComplete);
- 			}
- 		], function(pError)
- 		{
-diff --git a/source/crud/Meadow-Endpoint-BulkUpdate.js b/source/crud/Meadow-Endpoint-BulkUpdate.js
-index 95b5a71..cf33e2e 100644
---- a/source/crud/Meadow-Endpoint-BulkUpdate.js
-+++ b/source/crud/Meadow-Endpoint-BulkUpdate.js
-@@ -13,6 +13,7 @@
- var libAsync = require('async');
- 
- var doUpdate = require('./Meadow-Operation-Update.js');
-+const streamRecordsToResponse = require('./Meadow-StreamRecordArray');
- 
- var doAPIUpdateEndpoint = function(pRequest, pResponse, fNext)
- {
-@@ -57,8 +58,7 @@ var doAPIUpdateEndpoint = function(pRequest, pResponse, fNext)
- 			function(fStageComplete)
- 			{
- 				//5. Respond with the new record
--				pResponse.send(pRequest.UpdatedRecords);
--				return fStageComplete(null);
-+				return streamRecordsToResponse(pResponse, pRequest.UpdatedRecords, fStageComplete);
- 			}
- 		], function(pError)
- 		{
-diff --git a/source/crud/Meadow-Endpoint-BulkUpsert.js b/source/crud/Meadow-Endpoint-BulkUpsert.js
-index e1f7b67..3f8881b 100644
---- a/source/crud/Meadow-Endpoint-BulkUpsert.js
-+++ b/source/crud/Meadow-Endpoint-BulkUpsert.js
-@@ -14,6 +14,7 @@ var libAsync = require('async');
- 
- var doUpsert = require('./Meadow-Operation-Upsert.js');
- var marshalLiteList = require('./Meadow-Marshal-LiteList.js');
-+const streamRecordsToResponse = require('./Meadow-StreamRecordArray');
- 
- var doAPIUpsertEndpoint = function(pRequest, pResponse, fNext)
- {
-@@ -59,8 +60,7 @@ var doAPIUpsertEndpoint = function(pRequest, pResponse, fNext)
- 			function(fStageComplete)
- 			{
- 				//5. Respond with the new records
--				pResponse.send(marshalLiteList(pRequest.UpsertedRecords, pRequest));
--				return fStageComplete(null);
-+				return streamRecordsToResponse(pResponse, marshalLiteList(pRequest.UpsertedRecords, pRequest), fStageComplete);
- 			}
- 		], function(pError)
- 		{
-diff --git a/source/crud/Meadow-Endpoint-ReadLiteList.js b/source/crud/Meadow-Endpoint-ReadLiteList.js
-index e1113b0..f6837be 100644
---- a/source/crud/Meadow-Endpoint-ReadLiteList.js
-+++ b/source/crud/Meadow-Endpoint-ReadLiteList.js
-@@ -9,6 +9,8 @@
- var libAsync = require('async');
- var meadowFilterParser = require('./Meadow-Filter-Parse.js');
- var marshalLiteList = require('./Meadow-Marshal-LiteList.js');
-+const streamRecordsToResponse = require('./Meadow-StreamRecordArray');
-+
- /**
- * Get a set of records from a DAL.
- */
-@@ -123,8 +125,7 @@ var doAPIReadLiteEndpoint = function(pRequest, pResponse, fNext)
- 			}
- 
- 			pRequest.CommonServices.log.info('Read a recordset lite list with '+pResultRecords.length+' results.', {SessionID:pRequest.UserSession.SessionID, RequestID:pRequest.RequestUUID, RequestURL:pRequest.url, Action:pRequest.DAL.scope+'-ReadLite'}, pRequest);
--			pResponse.send(pResultRecords);
--			return fNext();
-+			return streamRecordsToResponse(pResponse, pResultRecords, fNext);
- 		}
- 	);
- };
-diff --git a/source/crud/Meadow-Endpoint-ReadSelectList.js b/source/crud/Meadow-Endpoint-ReadSelectList.js
-index d41580d..5402a35 100644
---- a/source/crud/Meadow-Endpoint-ReadSelectList.js
-+++ b/source/crud/Meadow-Endpoint-ReadSelectList.js
-@@ -8,6 +8,8 @@
- */
- var libAsync = require('async');
- var meadowFilterParser = require('./Meadow-Filter-Parse.js');
-+const streamRecordsToResponse = require('./Meadow-StreamRecordArray');
-+
- /**
- * Get a set of records from a DAL.
- */
-@@ -130,8 +132,7 @@ var doAPIReadSelectListEndpoint = function(pRequest, pResponse, fNext)
- 			}
- 
- 			pRequest.CommonServices.log.info('Read a recordset select list with '+pResultRecords.length+' results.', {SessionID:pRequest.UserSession.SessionID, RequestID:pRequest.RequestUUID, RequestURL:pRequest.url, Action:pRequest.DAL.scope+'-ReadSelectList'}, pRequest);
--			pResponse.send(pResultRecords);
--			return fNext();
-+			return streamRecordsToResponse(pResponse, pResultRecords, fNext);
- 		}
- 	);
- };
-diff --git a/source/crud/Meadow-Endpoint-Reads.js b/source/crud/Meadow-Endpoint-Reads.js
-index 49cc779..669441f 100644
---- a/source/crud/Meadow-Endpoint-Reads.js
-+++ b/source/crud/Meadow-Endpoint-Reads.js
-@@ -8,6 +8,8 @@
- */
- var libAsync = require('async');
- var meadowFilterParser = require('./Meadow-Filter-Parse.js');
-+const streamRecordsToResponse = require('./Meadow-StreamRecordArray');
-+
- /**
- * Get a set of records from a DAL.
- */
-@@ -113,8 +115,8 @@ var doAPIReadsEndpoint = function(pRequest, pResponse, fNext)
- 			}
- 
- 			pRequest.CommonServices.log.info('Read a list of records.', {SessionID:pRequest.UserSession.SessionID, RequestID:pRequest.RequestUUID, RequestURL:pRequest.url, Action:pRequest.DAL.scope+'-Reads'}, pRequest);
--			pResponse.send(pRequest.Records);
--			return fNext();
-+
-+			streamRecordsToResponse(pResponse, pRequest.Records, fNext);
- 		}
- 	);
- };
-diff --git a/source/crud/Meadow-Endpoint-ReadsBy.js b/source/crud/Meadow-Endpoint-ReadsBy.js
-index 36a5397..b7c5deb 100644
---- a/source/crud/Meadow-Endpoint-ReadsBy.js
-+++ b/source/crud/Meadow-Endpoint-ReadsBy.js
-@@ -7,6 +7,8 @@
- * @module Meadow
- */
- var libAsync = require('async');
-+const streamRecordsToResponse = require('./Meadow-StreamRecordArray');
-+
- /**
- * Get a specific record from a DAL.
- */
-@@ -140,8 +142,7 @@ var doAPIReadsByEndpoint = function(pRequest, pResponse, fNext)
- 			}
- 
- 			pRequest.CommonServices.log.info('Read a list of records by '+pRequest.params.ByField+' = '+pRequest.params.ByValue+'.', {SessionID:pRequest.UserSession.SessionID, RequestID:pRequest.RequestUUID, RequestURL:pRequest.url, Action:pRequest.DAL.scope+'-ReadsBy'}, pRequest);
--			pResponse.send(pRequest.Records);
--			return fNext();
-+			return streamRecordsToResponse(pResponse, pRequest.Records, fNext);
- 		}
- 	);
- };
-diff --git a/test/MeadowEndpoints_basic_tests.js b/test/MeadowEndpoints_basic_tests.js
-index ac40dcc..02944db 100644
---- a/test/MeadowEndpoints_basic_tests.js
-+++ b/test/MeadowEndpoints_basic_tests.js
-@@ -736,10 +736,9 @@ suite
- 						.end(
- 							function (pError, pResponse)
- 							{
--								console.log('FUCK'+pResponse.text)
- 								var tmpResults = JSON.parse(pResponse.text);
--								Expect(tmpResults.length).to.equal(6);
--								Expect(tmpResults[0].Value).to.equal('FableTest #1');
-+								Expect(tmpResults.length).to.equal(2);
-+								Expect(tmpResults[0].Value).to.equal('FableTest #3');
- 								fDone();
- 							}
- 						);
--- 
-2.25.1
-

package/0001-Register-wildcard-matches-that-have-parameter-count-.patch

@@ -1,38 +0,0 @@
-From 6e13b744340cf152a393614188673e65f45d963b Mon Sep 17 00:00:00 2001
-From: Alex Decker <alex.decker@headlight.com>
-Date: Fri, 24 Sep 2021 17:16:18 -0700
-Subject: [PATCH 1/3] Register wildcard matches that have parameter-count
- matches afterward, so the exact match is used.
-
----
- source/Meadow-Endpoints.js | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/source/Meadow-Endpoints.js b/source/Meadow-Endpoints.js
-index ec6c5df..288cda9 100644
---- a/source/Meadow-Endpoints.js
-+++ b/source/Meadow-Endpoints.js
-@@ -342,17 +342,17 @@ var MeadowEndpoints = function()
- 				pRestServer.get('/1.0/'+tmpEndpointName+'s/FilteredTo/:Filter', _EndpointAuthenticators.Reads, wireState, _Endpoints.Reads);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'s/FilteredTo/:Filter/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.Reads);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'Select', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadSelectList);
--				pRestServer.get('/1.0/'+tmpEndpointName+'Select/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadSelectList);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'Select/FilteredTo/:Filter', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadSelectList);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'Select/FilteredTo/:Filter/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadSelectList);
-+				pRestServer.get('/1.0/'+tmpEndpointName+'Select/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadSelectList);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'s/Lite', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
--				pRestServer.get('/1.0/'+tmpEndpointName+'s/Lite/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'s/Lite/FilteredTo/:Filter', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'s/Lite/FilteredTo/:Filter/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
-+				pRestServer.get('/1.0/'+tmpEndpointName+'s/Lite/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'s/LiteExtended/:ExtraColumns', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
--				pRestServer.get('/1.0/'+tmpEndpointName+'s/LiteExtended/:ExtraColumns/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'s/LiteExtended/:ExtraColumns/FilteredTo/:Filter', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'s/LiteExtended/:ExtraColumns/FilteredTo/:Filter/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
-+				pRestServer.get('/1.0/'+tmpEndpointName+'s/LiteExtended/:ExtraColumns/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.ReadLiteList);
- 				pRestServer.get('/1.0/'+tmpEndpointName+'s/:Begin/:Cap', _EndpointAuthenticators.Reads, wireState, _Endpoints.Reads);
- 			}
- 			if (_EnabledBehaviors.Update)
--- 
-2.25.1
-

package/0002-Bump-package-version.patch

@@ -1,24 +0,0 @@
-From 80e05ff43891942bfdcebe03a3680402bfc627a4 Mon Sep 17 00:00:00 2001
-From: Alex Decker <alex.decker@headlight.com>
-Date: Fri, 12 Nov 2021 23:31:42 -0800
-Subject: [PATCH 2/2] Bump package version.
-
----
- package.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/package.json b/package.json
-index b5bf05f..c55df53 100644
---- a/package.json
-+++ b/package.json
-@@ -1,6 +1,6 @@
- {
-   "name": "meadow-endpoints",
--  "version": "2.0.11",
-+  "version": "2.0.12",
-   "description": "Automatic API endpoints for Meadow data.",
-   "main": "source/Meadow-Endpoints.js",
-   "scripts": {
--- 
-2.25.1
-

package/0002-Fix-indent.patch

@@ -1,47 +0,0 @@
-From f45d012b61f34ba52756cfb52ab0b66158493973 Mon Sep 17 00:00:00 2001
-From: Alex Decker <alex.decker@headlight.com>
-Date: Fri, 24 Sep 2021 17:17:19 -0700
-Subject: [PATCH 2/3] Fix indent.
-
----
- source/Meadow-Endpoints.js | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/source/Meadow-Endpoints.js b/source/Meadow-Endpoints.js
-index 288cda9..2d1204e 100644
---- a/source/Meadow-Endpoints.js
-+++ b/source/Meadow-Endpoints.js
-@@ -357,21 +357,21 @@ var MeadowEndpoints = function()
- 			}
- 			if (_EnabledBehaviors.Update)
- 			{
--					pRestServer.put('/1.0/'+tmpEndpointName, _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Update);
--					pRestServer.put('/1.0/'+tmpEndpointName+'s', _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Updates);
--					pRestServer.put('/1.0/'+tmpEndpointName+'/Upsert', _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Upsert);
--					pRestServer.put('/1.0/'+tmpEndpointName+'/Upserts', _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Upserts);
-+				pRestServer.put('/1.0/'+tmpEndpointName, _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Update);
-+				pRestServer.put('/1.0/'+tmpEndpointName+'s', _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Updates);
-+				pRestServer.put('/1.0/'+tmpEndpointName+'/Upsert', _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Upsert);
-+				pRestServer.put('/1.0/'+tmpEndpointName+'/Upserts', _CommonServices.bodyParser(), _EndpointAuthenticators.Update, wireState, _Endpoints.Upserts);
- 			}
- 			if (_EnabledBehaviors.Delete)
- 			{
--					pRestServer.del('/1.0/'+tmpEndpointName, _CommonServices.bodyParser(), _EndpointAuthenticators.Delete, wireState, _Endpoints.Delete);
--					pRestServer.del('/1.0/'+tmpEndpointName+'/:IDRecord', _EndpointAuthenticators.Delete, wireState, _Endpoints.Delete);
-+				pRestServer.del('/1.0/'+tmpEndpointName, _CommonServices.bodyParser(), _EndpointAuthenticators.Delete, wireState, _Endpoints.Delete);
-+				pRestServer.del('/1.0/'+tmpEndpointName+'/:IDRecord', _EndpointAuthenticators.Delete, wireState, _Endpoints.Delete);
- 			}
- 			if (_EnabledBehaviors.Count)
- 			{
--					pRestServer.get('/1.0/'+tmpEndpointName+'s/Count', _EndpointAuthenticators.Count, wireState, _Endpoints.Count);
--					pRestServer.get('/1.0/'+tmpEndpointName+'s/Count/By/:ByField/:ByValue', _EndpointAuthenticators.Count, wireState, _Endpoints.CountBy);
--					pRestServer.get('/1.0/'+tmpEndpointName+'s/Count/FilteredTo/:Filter', _EndpointAuthenticators.Count, wireState, _Endpoints.Count);
-+				pRestServer.get('/1.0/'+tmpEndpointName+'s/Count', _EndpointAuthenticators.Count, wireState, _Endpoints.Count);
-+				pRestServer.get('/1.0/'+tmpEndpointName+'s/Count/By/:ByField/:ByValue', _EndpointAuthenticators.Count, wireState, _Endpoints.CountBy);
-+				pRestServer.get('/1.0/'+tmpEndpointName+'s/Count/FilteredTo/:Filter', _EndpointAuthenticators.Count, wireState, _Endpoints.Count);
- 			}
- 		};
- 
--- 
-2.25.1
-

package/0003-Bump-package-version-for-publication.patch

@@ -1,24 +0,0 @@
-From f15fe4fa2611ca3cbec3c78ba819bca746b1d917 Mon Sep 17 00:00:00 2001
-From: Alex Decker <alex.decker@headlight.com>
-Date: Fri, 24 Sep 2021 17:18:12 -0700
-Subject: [PATCH 3/3] Bump package version for publication.
-
----
- package.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/package.json b/package.json
-index 84dace7..b893e0c 100644
---- a/package.json
-+++ b/package.json
-@@ -1,6 +1,6 @@
- {
-   "name": "meadow-endpoints",
--  "version": "2.0.10",
-+  "version": "2.0.11",
-   "description": "Automatic API endpoints for Meadow data.",
-   "main": "source/Meadow-Endpoints.js",
-   "scripts": {
--- 
-2.25.1
-

package/cloud9setup.sh

@@ -1,25 +0,0 @@
-#! /bin/bash
-echo "Setup a Cloud9 environment for Meadow Endpoints"
-echo "MIT License."
-echo "steven velozo <steven@velozo.com>"
-echo ""
-echo "---"
-echo ""
-echo "## MySQL Parameters exist.  Script running!"
-echo "##"
-echo ""
-echo "!! This may be bad to run on anything but a Cloud9 virtual machine !!"
-echo ""
-read -p "Press [Enter] key to configure the environment..."
-echo ""
-echo "## Initializing the Cloud9 database environment..."
-time mysql-ctl start
-echo ""
-echo "## Creating Fable and Meadow databases and users..."
-time mysql-ctl cli < test/scripts/InitializeDatabase-C9.sql
-echo ""
-echo "## Remember to Switch to node 8.x by running these commands..."
-echo "nvm use 8"
-echo "nvm alias default 8"
-echo ""
-echo "## And we're done!  Have a great day."

package/source/crud/Meadow-Filter-Parse.js

@@ -1,206 +0,0 @@
-/**
-* Meadow Endpoint Utility Function - Parse a Filter String and put it into a Query.
-*
-* @license MIT
-*
-* @author Steven Velozo <steven@velozo.com>
-* @module Meadow
-*/
-/**
-* Parse GET-passed Filter Strings, turn the results into proper Meadow query stanzas
-
- Take the filter and return an array of filter instructions
- Basic instruction anatomy:
-       INSTRUCTION~FIELD~OPERATOR~VALUE
- FOP - Filter Open Paren
-       FOP~0~(~0
- FCP - Filter Close Paren
-       FCP~0~)~0
- FBV - Filter By Value (left-side AND connected)
-       FBV~Category~EQ~Books
-       Possible comparisons:
-       * EQ - Equals To (=)
-       * NE - Not Equals To (!=)
-       * GT - Greater Than (>)
-       * GE - Greater Than or Equals To (>=)
-       * LT - Less Than (<)
-       * LE - Less Than or Equals To (<=)
-       * LK - Like (Like)
-       * IN - Is NULL
-       * NN - Is NOT NULL
-       * INN - IN list
- FBVOR - Filter By Value (left-side OR connected)
- FBL - Filter By List (value list, separated by commas)
-	   FBL~Category~EQ~Books,Movies
-FBD	-  Filter by Date (exclude time)
-		FBD~UpdateDate~EQ~2015-10-01
-FSF - Filter Sort Field
-	FSF~Category~ASC~0
-	FSF~Category~DESC~0
-
- This means: FBV~Category~EQ~Books~FBV~PublishedYear~GT~2000~FSF~PublishedYear~DESC~0
-             Filters down to ALL BOOKS PUBLUSHED AFTER 200 IN DESCENDING ORDER
-*/
-
-// Get the comparison operator for use in a query stanza
-var getFilterComparisonOperator = function(pFilterOperator)
-{
-	var tmpOperator = '=';
-	switch(pFilterOperator)
-	{
-		case 'EQ':
-			tmpOperator = '=';
-			break;
-		case 'NE':
-			tmpOperator = '!=';
-			break;
-		case 'GT':
-			tmpOperator = '>';
-			break;
-		case 'GE':
-			tmpOperator = '>=';
-			break;
-		case 'LT':
-			tmpOperator = '<';
-			break;
-		case 'LE':
-			tmpOperator = '<=';
-			break;
-		case 'LK':
-			tmpOperator = 'LIKE';
-			break;
-		case 'NLK':
-			tmpOperator = 'NOT LIKE';
-			break;
-		case 'IN':
-			tmpOperator = 'IS NULL';
-			break;
-		case 'NN':
-			tmpOperator = 'IS NOT NULL';
-			break;
-		case 'INN':
-			tmpOperator = 'IN';
-			break;
-		case 'FOP':
-			tmpOperator = '(';
-			break;
-		case 'FCP':
-			tmpOperator = ')';
-			break;
-	}
-	return tmpOperator;
-};
-
-var addFilterStanzaToQuery = function(pFilterStanza, pQuery)
-{
-	if (!pFilterStanza.Instruction)
-	{
-		return false;
-	}
-
-	switch(pFilterStanza.Instruction)
-	{
-		case 'FBV':   // Filter by Value (left-side AND)
-			pQuery.addFilter(pFilterStanza.Field, pFilterStanza.Value, getFilterComparisonOperator(pFilterStanza.Operator), 'AND');
-			break;
-
-		case 'FBVOR': // Filter by Value (left-side OR)
-			pQuery.addFilter(pFilterStanza.Field, pFilterStanza.Value, getFilterComparisonOperator(pFilterStanza.Operator), 'OR');
-			break;
-
-		case 'FBL':   // Filter by List (left-side AND)
-			// Just split the value by comma for now.  May want to revisit better characters or techniques later.
-			pQuery.addFilter(pFilterStanza.Field, pFilterStanza.Value.split(','), getFilterComparisonOperator(pFilterStanza.Operator), 'AND');
-			break;
-
-		case 'FBLOR': // Filter by List (left-side OR)
-			// Just split the value by comma for now.  May want to revisit better characters or techniques later.
-			pQuery.addFilter(pFilterStanza.Field, pFilterStanza.Value.split(','), getFilterComparisonOperator(pFilterStanza.Operator, 'OR'));
-			break;
-
-		case 'FBD': // Filter by Date (exclude time)
-			pQuery.addFilter(`DATE(${pFilterStanza.Field})`, pFilterStanza.Value.split(','), getFilterComparisonOperator(pFilterStanza.Operator), 'AND', pFilterStanza.Field);
-			break;
-
-		case 'FBDOR': // Filter by Date (exclude time)
-			pQuery.addFilter(`DATE(${pFilterStanza.Field})`, pFilterStanza.Value.split(','), getFilterComparisonOperator(pFilterStanza.Operator), 'OR', pFilterStanza.Field);
-			break;
-
-		case 'FSF':   // Filter Sort Field
-			var tmpSortDirection = (pFilterStanza.Operator === 'DESC') ? 'Descending' : 'Ascending';
-			pQuery.addSort({Column:pFilterStanza.Field, Direction:tmpSortDirection});
-			break;
-
-		case 'FOP':   // Filter Open Paren
-			pQuery.addFilter('', '', '(');
-			break;
-
-		case 'FCP':   // Filter Close Paren
-			pQuery.addFilter('', '', ')');
-			break;
-
-
-		default:
-			//console.log('Unparsable filter stanza.');
-			return false;
-			break;
-	}
-
-	// Be paranoid about the instruction
-	pFilterStanza.Instruction = false;
-	return true;
-};
-
-var doParseFilter = function(pFilterString, pQuery)
-{
-	if (typeof(pFilterString) !== 'string')
-	{
-		return false;
-	}
-
-	var tmpFilterTerms = pFilterString.split('~');
-
-	if (tmpFilterTerms.length < 4)
-		return true;
-
-	var tmpFilterStanza = { Instruction:false };
-
-	for (var i = 0; i < tmpFilterTerms.length; i++)
-	{
-		switch(i % 4)
-		{
-			case 0:  // INSTRUCTION
-				addFilterStanzaToQuery(tmpFilterStanza, pQuery);
-				//console.log(i+' Instruction: '+tmpFilterTerms[i]);
-				tmpFilterStanza = (
-				{
-					Instruction: tmpFilterTerms[i],
-					Field: '',
-					Operator: '',
-					Value: ''
-				});
-				break;
-
-			case 1:  // FIELD
-				//console.log(i+' Field:       '+tmpFilterTerms[i]);
-				tmpFilterStanza.Field = tmpFilterTerms[i];
-				break;
-
-			case 2:  // OPERATOR
-				//console.log(i+' Operator:    '+tmpFilterTerms[i]);
-				tmpFilterStanza.Operator = tmpFilterTerms[i];
-				break;
-
-			case 3:  // VALUE
-				//console.log(i+' Value:       '+tmpFilterTerms[i]);
-				tmpFilterStanza.Value = tmpFilterTerms[i];
-				break;
-		}
-	}
-
-	addFilterStanzaToQuery(tmpFilterStanza, pQuery);
-
-	return true;
-};
-
-module.exports = doParseFilter;