Commit 04b2ec22 authored by Alexandra Rogova's avatar Alexandra Rogova

lint

parent fc90baef
......@@ -67,7 +67,7 @@
});
index.setRef(id);
// do not store the documents in the index
//index.saveDocument(false);
index.saveDocument(false);
return index;
}
......@@ -100,7 +100,7 @@
boost: 1,
bool: 'AND'
};
// we can only do a single-string search, so we can
// stop on the first indexed field we find
return index.search(value, config).map(function (result) {
......@@ -110,7 +110,7 @@
return null;
}
function recursiveIndexQuery(index, indexedFields, query, sub_storage) {
function recursiveIndexQuery(index, indexedFields, query) {
var ids = null,
subquery,
i,
......@@ -132,7 +132,7 @@
}
return ids;
}
return searchQuery(index, indexedFields, query.key, query.value);
}
......@@ -302,42 +302,41 @@
ElasticlunrStorage.prototype.repair = function () {
// rebuild index?
var idx,
doc_ids = [],
context = this,
args = arguments;
doc_ids = [],
context = this,
args = arguments;
return this._getIndex()
.push(function(index){
.push(function (index) {
idx = index;
return context._sub_storage.repair.apply(context._sub_storage, args);
})
.push(function(){
.push(function () {
return context._sub_storage.allDocs();
})
.push(function(all_docs){
.push(function (all_docs) {
var i,
queue = new RSVP.Queue(),
add_to_queue;
add_to_queue = function(id){
queue.push(function(){
queue = new RSVP.Queue(),
add_to_queue;
add_to_queue = function (id) {
queue.push(function () {
return context._sub_storage.get(id.toString());
})
.push(function(doc){
var data = JSON.parse(JSON.stringify(doc));
data.id = id.toString();
idx.updateDoc(data);
});
.push(function (doc) {
var data = JSON.parse(JSON.stringify(doc));
data.id = id.toString();
idx.updateDoc(data);
});
};
for (i=0; i<all_docs.data.rows.length; i+=1){
for (i = 0; i < all_docs.data.rows.length; i += 1) {
add_to_queue(all_docs.data.rows[i].id);
doc_ids.push(all_docs.data.rows[i].id);
}
return queue;
})
.push(undefined, function (my_error) {
if (my_error.status_code === 501) { //501 = sub_storage does not have allDocs capacity
//
if (my_error.status_code !== 501) {
throw my_error; //501 = sub_storage does not have allDocs capacity
}
else throw my_error;
});
};
......@@ -355,7 +354,7 @@
return this._sub_storage.hasCapacity(name);
};
ElasticlunrStorage.prototype.buildQuery = function (options) { // Appelé par allDocs
ElasticlunrStorage.prototype.buildQuery = function (options) {
var context = this,
indexedFields = this._index_fields,
runSubstorageQuery = options.select_list || options.include_docs,
......@@ -365,7 +364,7 @@
parsedQuery = jIO.QueryFactory.create(options.query);
return context._getIndex()
.push(function (index) {
return recursiveIndexQuery(index, indexedFields, parsedQuery, context._sub_storage);
return recursiveIndexQuery(index, indexedFields, parsedQuery);
})
.push(function (ids) {
try {
......
......@@ -620,7 +620,6 @@
deepEqual(options, expected_options, "repair 200 called");
return "OK";
};
jio.repair(expected_options)
/*.then(function (result) {
equal(result, "OK");
......@@ -632,15 +631,15 @@
start();
});
});
test("repair adds missing documents", function(){
test("repair adds missing documents", function () {
stop();
expect(2);
Index200.prototype.getAttachment = function () {
return true;
};
var sub_storage = jIO.createJIO({
type: "indexeddb",
database: "merge_test"
......@@ -655,17 +654,17 @@
type: "indexeddb",
database: "merge_test"
}
});
});
sub_storage.put("foo", {title: "bar"});
return jio.repair()
.push(function(){
.push(function () {
return jio.allDocs({
query: 'title: "bar"'
});
})
.push(function(result){
.push(function (result) {
equal(result.data.total_rows, 1);
equal(result.data.rows[0].id, "foo");
})
......@@ -676,15 +675,15 @@
start();
});
});
test("repair updates documents", function(){
test("repair updates documents", function () {
expect(2);
stop();
Index200.prototype.getAttachment = function () {
return true;
};
Index200.prototype.putAttachment = function () {
return true;
};
......@@ -703,19 +702,19 @@
type: "indexeddb",
database: "merge_test"
}
});
});
return jio.put("foo", {title: "bar"})
.push(function(){
.push(function () {
return sub_storage.put("foo", {title: "Hello world!"});
})
.push(function(){
.push(function () {
return jio.repair();
})
.push(function(){
.push(function () {
return jio.allDocs({query: 'title: "Hello world!"'});
})
.push(function(result){
.push(function (result) {
equal(result.data.total_rows, 1);
equal(result.data.rows[0].id, "foo");
})
......@@ -726,7 +725,7 @@
start();
});
});
/*
test("repair deletes outdated documents", function(){
var sub_storage = jIO.createJIO({
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment