esearch should call _esearch and return data to callback. Removed space in _esearch command and put it before encode, as query already has a space

fork
Ronnie 11 years ago
parent 68c08ac65d
commit 436a2761b2

@ -829,7 +829,7 @@ Connection.prototype._sort = function(which, sorts, criteria, cb) {
};
Connection.prototype.esearch = function(criteria, options, cb) {
this._search('UID ', criteria, options, cb);
this._esearch('UID ', criteria, options, cb);
};
Connection.prototype._esearch = function(which, criteria, options, cb) {
@ -843,7 +843,7 @@ Connection.prototype._esearch = function(which, criteria, options, cb) {
charset = '',
lines;
if (info.hasUTF8) {
charset = 'CHARSET UTF-8';
charset = ' CHARSET UTF-8';
lines = query.split(CRLF);
query = lines.shift();
}
@ -857,7 +857,7 @@ Connection.prototype._esearch = function(which, criteria, options, cb) {
if (Array.isArray(options))
options = options.join(' ');
this._enqueue(which + 'SEARCH RETURN (' + options + ') ' + charset + query, cb);
this._enqueue(which + 'SEARCH RETURN (' + options + ')' + charset + query, cb);
if (info.hasUTF8) {
var req = this._queue[this._queue.length - 1];
req.lines = lines;
@ -1098,7 +1098,9 @@ Connection.prototype._resUntagged = function(info) {
else if (type === 'preauth')
this.state = 'authenticated';
else if (type === 'sort' || type === 'thread')
this._curReq.cbargs.push(info.text);
this._curReq.cbargs.push(info.text);
else if (type === 'esearch')
this._curReq.cbargs.push(info.text);
else if (type === 'search') {
if (info.text.results !== undefined) {
// CONDSTORE-modified search results

Loading…
Cancel
Save