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

Remove E4X in tag-fixing sync code

Browse source
This commit is contained in:
Dan Stillman 2013-01-15 04:02:39 -05:00
parent 596c6da3ee
commit 0c442dc1f6
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2632,28 +2632,26 @@ Zotero.Sync.Server.Data = new function() {
// TEMP: Resend tags requested by server // TEMP: Resend tags requested by server
try { try {
if (xml.fixtags.length()) { for each(var tagsNode in updatedNode.xpath("fixtags/tags")) {
for each(var tagsNode in xml.fixtags.tags) { var libraryID = _libID(tagsNode.getAttribute('libraryID'));
var libraryID = _libID(tagsNode.@libraryID); if (libraryID && !Zotero.Libraries.isEditable(libraryID)) {
if (libraryID && !Zotero.Libraries.isEditable(libraryID)) { continue;
continue; }
} var tagsKeys = tagsNode.textContent.split(' ');
var tagsKeys = tagsNode.toString().split(' '); for each(var key in tagsKeys) {
for each(var key in tagsKeys) { var sql = "SELECT tagID FROM tags WHERE libraryID=? AND key=?";
var sql = "SELECT tagID FROM tags WHERE libraryID=? AND key=?"; var tagID = Zotero.DB.valueQuery(sql, [libraryID, key]);
var tagID = Zotero.DB.valueQuery(sql, [libraryID, key]);
var sql = "SELECT COUNT(*) > 0 FROM itemTags WHERE tagID=?";
var sql = "SELECT COUNT(*) > 0 FROM itemTags WHERE tagID=?"; if (Zotero.DB.valueQuery(sql, [tagID])) {
if (Zotero.DB.valueQuery(sql, [tagID])) { var sql = "UPDATE tags SET clientDateModified=CURRENT_TIMESTAMP "
var sql = "UPDATE tags SET clientDateModified=CURRENT_TIMESTAMP " + "WHERE tagID=?";
+ "WHERE tagID=?"; Zotero.DB.query(sql, [tagID]);
Zotero.DB.query(sql, [tagID]); syncSession.addToUpdated({
syncSession.addToUpdated({ objectType: 'tag',
objectType: 'tag', libraryID: libraryID,
libraryID: libraryID, key: key
key: key });
});
}
} }
} }
} }