Fix sorting in NoSQL.

petersirka · petersirka · commit b757e778fc10 · 2017-05-10T10:25:32.000+02:00
diff --git a/nosql.js b/nosql.js
@@ -961,62 +961,52 @@ function nosqlinlinesorter(item, builder, doc) {
 	if (length < builder.$limit) {
 		item.response.push(doc);
 		length + 1 >= builder.$limit && item.response.quicksort(builder.$sort.name, builder.$sort.asc);
-	} else {
-		if (builder.$sort.asc)
-			nosqlresort_asc(item.response, builder, doc); // inline sorter
-		else
-			nosqlresort_desc(item.response, builder, doc); // inline sorter
-	}
+	} else
+		nosqlresort(item.response, builder, doc);
 }
 
 function nosqlsortvalue(a, b, sorter) {
 	var type = typeof(a);
 	if (type === 'number')
-		return sorter.asc ? a < b : a > b;
+		return sorter.asc ? a > b : a < b;
 	else if (type === 'string') {
 		a = (a.length > 5 ? a.substring(0, 5) : a).toLowerCase().removeDiacritics();
 		var c = a.localeCompare(b);
-		return sorter.asc ? c === -1 : c === 1;
+		return sorter.asc ? c === 1 : c === -1;
 	} else if (a instanceof Date)
-		return sorter.asc ? a < b : a > b;
-
+		return sorter.asc ? a > b : a < b;
 	return false;
 }
 
-function nosqlresort_asc(arr, builder, doc) {
+function nosqlresort(arr, builder, doc) {
 	var b = doc[builder.$sort.name];
 	if (typeof(b) === 'string')
 		b = (b.length > 5 ? b.substring(0, 5) : b).toLowerCase().removeDiacritics();
+
+	var beg = 0;
 	var length = arr.length;
-	for (var i = 0, length = arr.length; i < length; i++) {
-	// for (var i = length - 1; i > -1; i--) {
-		var item = arr[i];
-		var sort = nosqlsortvalue(item[builder.$sort.name], b, builder.$sort);
-		console.log('CYCLES', JSON.stringify(arr), item[builder.$sort.name], b, sort);
-		if (sort)
-			continue;
-		for (var j = length - 1; j > i; j--)
-			arr[j] = arr[j - 1];
-		arr[i] = doc;
+	var tmp = length - 1;
+
+	var sort = nosqlsortvalue(arr[tmp][builder.$sort.name], b, builder.$sort);
+	if (!sort)
 		return;
-	}
-}
 
-function nosqlresort_desc(arr, builder, doc) {
-	var b = doc[builder.$sort.name];
-	if (typeof(b) === 'string')
-		b = (b.length > 5 ? b.substring(0, 5) : b).toLowerCase().removeDiacritics();
-	for (var i = 0, length = arr.length; i < length; i++) {
-		console.log('CYCLES');
+	tmp = arr.length / 2 >> 0;
+	sort = nosqlsortvalue(arr[tmp][builder.$sort.name], b, builder.$sort);
+	if (!sort)
+		beg = tmp + 1;
+
+	for (var i = beg; i < length; i++) {
 		var item = arr[i];
 		var sort = nosqlsortvalue(item[builder.$sort.name], b, builder.$sort);
-		if (sort)
+		if (!sort)
 			continue;
 		for (var j = length - 1; j > i; j--)
 			arr[j] = arr[j - 1];
 		arr[i] = doc;
 		return;
 	}
+
 }
 
 Database.prototype.$reader2_inmemory = function(name, items, callback) {
diff --git a/test/databases/pages.nosql b/test/databases/pages.nosql
@@ -1,8 +1,20 @@
-{"name":"b"}
-{"name":"g"}
-{"name":"h"}
+{"name":"o"}
+{"name":"s"}
 {"name":"e"}
+{"name":"k"}
+{"name":"u"}
+{"name":"d"}
+{"name":"r"}
+{"name":"l"}
 {"name":"f"}
+{"name":"t"}
+{"name":"i"}
+{"name":"h"}
+{"name":"b"}
+{"name":"n"}
+{"name":"g"}
+{"name":"m"}
 {"name":"c"}
-{"name":"d"}
+{"name":"j"}
 {"name":"a"}
+{"name":"p"}
diff --git a/test/test-tmp.js b/test/test-tmp.js
@@ -1,16 +1,16 @@
 require('../index');
 
 var filter = NOSQL('pages').find();
-var page = 0;
+var page = 2;
 
 filter.take(4);
 filter.skip(page * 4);
 
 filter.fields('name');
-filter.sort('name');
+filter.sort('name', true);
 
-filter.callback(function(err, docs, count) {
-	var a = []
+filter.callback(function(err, docs) {
+	var a = [];
 	docs.forEach(function(b) {
 		a.push(b.name);
 	});
