mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Consider fulltextItems with SYNC_STATE_MISSING as unindexed

Browse source 
The items will still match full-text word searches, but they won't match
phrase searches (because those require cache files for non-text
attachments) and the full-text won't sync to other computers, so they
should really be reindexed.
This commit is contained in:
Dan Stillman 2017-07-26 06:07:47 -04:00
parent 67ccb632b4
commit c110e64293
2 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
chrome/content/zotero/xpcom/fulltext.js
View file

@ -1506,6 +1506,14 @@ Zotero.Fulltext = Zotero.FullText = new function(){
throw new Error('Item is not an attachment');
}
// If the file or cache file wasn't available during syncing, mark as unindexed
var synced = yield Zotero.DB.valueQueryAsync(
"SELECT synced FROM fulltextItems WHERE itemID=?", item.id
);
if (synced === false || synced == this.SYNC_STATE_MISSING) {
return this.INDEX_STATE_UNINDEXED;
}
var itemID = item.id;
switch (item.attachmentContentType) {
// Use pages for PDFs
@ -1570,10 +1578,10 @@ Zotero.Fulltext = Zotero.FullText = new function(){
* @return {Promise}
*/
this.getIndexStats = Zotero.Promise.coroutine(function* () {
var sql = "SELECT COUNT(*) FROM fulltextItems WHERE "
+ "(indexedPages IS NOT NULL AND indexedPages=totalPages) OR "
+ "(indexedChars IS NOT NULL AND indexedChars=totalChars)"
var indexed = yield Zotero.DB.valueQueryAsync(sql);
var sql = "SELECT COUNT(*) FROM fulltextItems WHERE synced != ? AND "
+ "((indexedPages IS NOT NULL AND indexedPages=totalPages) OR "
+ "(indexedChars IS NOT NULL AND indexedChars=totalChars))"
var indexed = yield Zotero.DB.valueQueryAsync(sql, this.SYNC_STATE_MISSING);
var sql = "SELECT COUNT(*) FROM fulltextItems WHERE "
+ "(indexedPages IS NOT NULL AND indexedPages<totalPages) OR "
@ -1581,19 +1589,14 @@ Zotero.Fulltext = Zotero.FullText = new function(){
var partial = yield Zotero.DB.valueQueryAsync(sql);
var sql = "SELECT COUNT(*) FROM itemAttachments WHERE itemID NOT IN "
+ "(SELECT itemID FROM fulltextItems WHERE "
+ "indexedPages IS NOT NULL OR indexedChars IS NOT NULL)";
var unindexed = yield Zotero.DB.valueQueryAsync(sql);
+ "(SELECT itemID FROM fulltextItems WHERE synced != ? AND "
+ "(indexedPages IS NOT NULL OR indexedChars IS NOT NULL))";
var unindexed = yield Zotero.DB.valueQueryAsync(sql, this.SYNC_STATE_MISSING);
var sql = "SELECT COUNT(*) FROM fulltextWords";
var words = yield Zotero.DB.valueQueryAsync(sql);
return {
indexed: indexed,
partial: partial,
unindexed: unindexed,
words: words
};
return { indexed, partial, unindexed, words };
});
@ -1639,11 +1642,13 @@ Zotero.Fulltext = Zotero.FullText = new function(){
// Get all attachments other than web links
var sql = "SELECT itemID FROM itemAttachments WHERE linkMode!="
+ Zotero.Attachments.LINK_MODE_LINKED_URL;
var params = [];
if (unindexedOnly) {
sql += " AND itemID NOT IN (SELECT itemID FROM fulltextItems "
+ "WHERE indexedChars IS NOT NULL OR indexedPages IS NOT NULL)";
+ "WHERE synced != ? AND (indexedChars IS NOT NULL OR indexedPages IS NOT NULL))";
params.push(this.SYNC_STATE_MISSING);
}
var items = yield Zotero.DB.columnQueryAsync(sql);
var items = yield Zotero.DB.columnQueryAsync(sql, params);
if (items) {
yield Zotero.DB.executeTransaction(function* () {
yield Zotero.DB.queryAsync("DELETE FROM fulltextItemWords WHERE itemID IN (" + sql + ")");

4
test/tests/fulltextTest.js
View file

@ -242,11 +242,15 @@ describe("Zotero.Fulltext", function () {
var sql = "SELECT synced FROM fulltextItems WHERE itemID=?";
var synced = yield Zotero.DB.valueQueryAsync(sql, item.id);
assert.equal(synced, Zotero.Fulltext.SYNC_STATE_UNSYNCED);
var indexed = yield Zotero.Fulltext.getIndexedState(item);
assert.equal(indexed, Zotero.Fulltext.INDEX_STATE_INDEXED);
yield Zotero.Fulltext.getUnsyncedContent(item.libraryID);
synced = yield Zotero.DB.valueQueryAsync(sql, item.id);
assert.equal(synced, Zotero.Fulltext.SYNC_STATE_MISSING);
indexed = yield Zotero.Fulltext.getIndexedState(item);
assert.equal(indexed, Zotero.Fulltext.INDEX_STATE_UNINDEXED);
});
})