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

- Don't set the last local sync time after a download if an upload fails to avoid reuploading of downloaded data

Browse source 
- If no local sync time set (because an initial upload never went through), ignore remote sync time and repull all data so downloaded items aren't reuploaded
This commit is contained in:
Dan Stillman 2011-05-17 20:53:38 +00:00
parent 66a5b1ab14
commit a9dbe02ef9
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
chrome/content/zotero/xpcom/sync.js
View file

@ -1333,6 +1333,16 @@ Zotero.Sync.Server = new function () {
if (!lastsync) { if (!lastsync) {
lastsync = 1; lastsync = 1;
} }
// If no local timestamp is stored, don't use remote time
//
// This used to be possible when remote time was saved whether or not
// the subsequent upload went through
var lastLocalSyncTime = Zotero.Sync.Server.lastLocalSyncTime;
if (!lastLocalSyncTime) {
lastsync = 1;
}
var body = _apiVersionComponent var body = _apiVersionComponent
+ '&' + Zotero.Sync.Server.sessionIDComponent + '&' + Zotero.Sync.Server.sessionIDComponent
+ '&lastsync=' + lastsync; + '&lastsync=' + lastsync;
@ -1407,7 +1417,6 @@ Zotero.Sync.Server = new function () {
Zotero.UnresponsiveScriptIndicator.disable(); Zotero.UnresponsiveScriptIndicator.disable();
var lastLocalSyncTime = Zotero.Sync.Server.lastLocalSyncTime;
var lastLocalSyncDate = lastLocalSyncTime ? var lastLocalSyncDate = lastLocalSyncTime ?
new Date(lastLocalSyncTime * 1000) : false; new Date(lastLocalSyncTime * 1000) : false;
@ -1465,10 +1474,9 @@ Zotero.Sync.Server = new function () {
Zotero.debug(xmlstr); Zotero.debug(xmlstr);
} }
Zotero.Sync.Server.lastRemoteSyncTime = response.getAttribute('timestamp');
if (!xmlstr) { if (!xmlstr) {
Zotero.debug("Nothing to upload to server"); Zotero.debug("Nothing to upload to server");
Zotero.Sync.Server.lastRemoteSyncTime = response.getAttribute('timestamp');
Zotero.Sync.Server.lastLocalSyncTime = nextLocalSyncTime; Zotero.Sync.Server.lastLocalSyncTime = nextLocalSyncTime;
Zotero.Sync.Server.nextLocalSyncDate = false; Zotero.Sync.Server.nextLocalSyncDate = false;
Zotero.DB.commitTransaction(); Zotero.DB.commitTransaction();