suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix one other case where the sync could never end

Browse Source
This commit is contained in:
Dan Stillman 2008-09-01 03:42:42 +00:00
parent d9f2d79648
commit 4ff983661a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
chrome/content/zotero/xpcom/storage.js
View File

@ -689,12 +689,8 @@ Zotero.Sync.Storage = new function () {
this.downloadFile = function (itemID) { this.downloadFile = function (itemID) {
var item = Zotero.Items.get(itemID); var item = Zotero.Items.get(itemID);
if (!item) { if (!item) {
var msg = "Item " + itemID _error("Item " + itemID
+ " not found in Zotero.Sync.Storage.downloadFile()"; + " not found in Zotero.Sync.Storage.downloadFile()");
Zotero.debug(msg);
Components.utils.reportError(msg);
_queueAdvance('download', Zotero.Sync.Storage.downloadFile, true);
return;
} }
// Retrieve modification time from server to store locally afterwards // Retrieve modification time from server to store locally afterwards
@ -1121,6 +1117,17 @@ Zotero.Sync.Storage = new function () {
if (fileList.length == 0) { if (fileList.length == 0) {
Zotero.debug('No files to add -- removing zip file'); Zotero.debug('No files to add -- removing zip file');
tmpFile.remove(null); tmpFile.remove(null);
_removeRequest({
name: _getItemURI(item).spec,
requestMethod: "PUT",
QueryInterface: function (iid) {
if (iid.equals(Components.interfaces.nsIHttpChannel) ||
iid.equals(Components.interfaces.nsISupports)) {
return this;
}
throw Components.results.NS_NOINTERFACE;
}
});
_queueAdvance('upload', Zotero.Sync.Storage.uploadFile, true); _queueAdvance('upload', Zotero.Sync.Storage.uploadFile, true);
return false; return false;
} }