www

commit 342e631beb79c9b71cc96ab6765aba79fd6db8dc
parent 6e9b491e82eac694227b34147840358d76e48ec4
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue,  5 Nov 2013 17:20:29 -0500

Don't reindex downloaded full-text content if already up to date

Diffstat:
M
chrome/content/zotero/xpcom/fulltext.js
 | 
55
+++++++++++++++++++++++++++++++++++++++----------------

1 file changed, 39 insertions(+), 16 deletions(-)
diff --git a/chrome/content/zotero/xpcom/fulltext.js b/chrome/content/zotero/xpcom/fulltext.js
@@ -724,41 +724,64 @@ Zotero.Fulltext = new function(){
 	 * Save full-text content and stats to a cache file
 	 */
 	this.setItemContent = function (libraryID, key, text, stats, version) {
+		var libraryKey = libraryID + "/" + key;
 		var item = Zotero.Items.getByLibraryAndKey(libraryID, key);
 		if (!item) {
-			let msg = "Item not found setting full-text content";
+			let msg = "Item " + libraryKey + " not found setting full-text content";
 			Zotero.debug(msg, 1);
 			Components.utils.reportError(msg);
 			return;
 		}
 		var itemID = item.id;
 		
+		var currentVersion = Zotero.DB.valueQuery(
+			"SELECT version FROM fulltextItems WHERE itemID=?", itemID
+		);
+		
 		if (text !== '') {
-			var cacheFile = this.getItemProcessorCacheFile(itemID);
+			var processorCacheFile = this.getItemProcessorCacheFile(itemID);
+			var itemCacheFile = this.getItemCacheFile(itemID);
 			
 			// If a storage directory doesn't exist, create it
-			if (!cacheFile.parent.exists()) {
+			if (!processorCacheFile.parent.exists()) {
 				Zotero.Attachments.createDirectoryForItem(itemID);
 			}
 			
-			Zotero.debug("Writing full-text content and data to " + cacheFile.path);
-			Zotero.File.putContents(cacheFile, JSON.stringify({
-				indexedChars: stats.indexedChars,
-				totalChars: stats.totalChars,
-				indexedPages: stats.indexedPages,
-				totalPages: stats.totalPages,
-				version: version,
-				text: text
-			}));
-			var synced = SYNC_STATE_TO_PROCESS;
+			// If the local version of the content is already up to date and cached, skip
+			if (currentVersion && currentVersion == version && itemCacheFile.exists()) {
+				Zotero.debug("Current full-text content version matches remote for item "
+					+ libraryKey + " -- skipping");
+				var synced = SYNC_STATE_IN_SYNC;
+			}
+			// If the local version is 0 but the text matches, just update the version
+			else if (currentVersion == 0 && itemCacheFile.exists()
+					&& Zotero.File.getContents(itemCacheFile) == text) {
+				Zotero.debug("Current full-text content matches remote for item "
+					+ libraryKey + " -- updating version");
+				var synced = SYNC_STATE_IN_SYNC;
+				Zotero.DB.query("UPDATE fulltextItems SET version=? WHERE itemID=?", [version, itemID]);
+			}
+			else {
+				Zotero.debug("Writing full-text content and data for item " + libraryKey
+					+ " to " + processorCacheFile.path);
+				Zotero.File.putContents(processorCacheFile, JSON.stringify({
+					indexedChars: stats.indexedChars,
+					totalChars: stats.totalChars,
+					indexedPages: stats.indexedPages,
+					totalPages: stats.totalPages,
+					version: version,
+					text: text
+				}));
+				var synced = SYNC_STATE_TO_PROCESS;
+			}
 		}
 		else {
-			Zotero.debug("Marking full-text content for download");
+			Zotero.debug("Marking full-text content for download for item " + libraryKey);
 			var synced = SYNC_STATE_TO_DOWNLOAD;
 		}
 		
-		// Mark the item as unprocessed
-		if (Zotero.DB.valueQuery("SELECT COUNT(*) FROM fulltextItems WHERE itemID=?", itemID)) {
+		// If indexed previously, update the sync state
+		if (currentVersion !== false) {
 			Zotero.DB.query("UPDATE fulltextItems SET synced=? WHERE itemID=?", [synced, itemID]);
 		}
 		// If not yet indexed, add an empty row