From dd46e267eeb55c57bf01077c42c94b42fc1020b8 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 7 Feb 2012 05:50:31 -0500
Subject: [PATCH] Fix "libraryID, name, type are not unique" tag sync error

Ported from server
---
 chrome/content/zotero/xpcom/data/tag.js | 90 +++++++++++++++++--------
 1 file changed, 61 insertions(+), 29 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data/tag.js b/chrome/content/zotero/xpcom/data/tag.js
index cf56eb375..9cecdf443 100644
--- a/chrome/content/zotero/xpcom/data/tag.js
+++ b/chrome/content/zotero/xpcom/data/tag.js
@@ -337,39 +337,71 @@ Zotero.Tag.prototype.save = function (full) {
 			key
 		];
 		
-		if (isNew) {
-			var sql = "INSERT INTO tags (" + columns.join(', ') + ") VALUES ("
-				+ placeholders.join(', ') + ")";
-			var insertID = Zotero.DB.query(sql, sqlValues);
-			if (!tagID) {
-				tagID = insertID;
+		try {
+			if (isNew) {
+				var sql = "INSERT INTO tags (" + columns.join(', ') + ") VALUES ("
+					+ placeholders.join(', ') + ")";
+				var insertID = Zotero.DB.query(sql, sqlValues);
+				if (!tagID) {
+					tagID = insertID;
+				}
 			}
-		}
-		else {
-			// Remove tagID from beginning
-			columns.shift();
-			sqlValues.shift();
-			sqlValues.push(tagID);
-			
-			var sql = "UPDATE tags SET " + columns.join("=?, ") + "=?"
-				+ " WHERE tagID=?";
-			try {
+			else {
+				// Remove tagID from beginning
+				columns.shift();
+				sqlValues.shift();
+				sqlValues.push(tagID);
+				
+				var sql = "UPDATE tags SET " + columns.join("=?, ") + "=?"
+					+ " WHERE tagID=?";
 				Zotero.DB.query(sql, sqlValues);
 			}
-			// TEMP
-			catch (e) {
-				var sql = "SELECT * FROM tags";
-				var tags = Zotero.DB.query(sql);
-				for each(var tag in tags) {
-					Zotero.debug('------');
-					Zotero.debug(tag.tagID);
-					Zotero.debug(tag.libraryID);
-					Zotero.debug(tag.name);
-					Zotero.debug(tag.type);
-					Zotero.debug(tag.dateAdded);
-					Zotero.debug(tag.dateModified);
-					Zotero.debug(tag.clientDateModified);
+		}
+		catch (e) {
+			// If an incoming tag is the same as an existing tag, but with a different key,
+			// then delete the old tag and add its linked items to the new tag
+			if (typeof e == 'string' && e.indexOf('columns libraryID, name, type are not unique') != -1) {
+				Zotero.debug("Tag matches existing tag with different key -- delete old tag and merging items");
+				
+				// GET existing tag
+				var existing = Zotero.Tags.getIDs(this.name, this.libraryID);
+				if (!existing) {
+					throw new Error("Existing tag not found");
 				}
+				for each(var id in existing) {
+					var tag = Zotero.Tags.get(id, true);
+					if (tag.type == this.type) {
+						var linked = tag.getLinkedItems(true);
+						Zotero.Tags.erase(id);
+						Zotero.Tags.purge(id);
+						break;
+					}
+				}
+				
+				// Save again
+				if (isNew) {
+					var sql = "INSERT INTO tags (" + columns.join(', ') + ") VALUES ("
+						+ placeholders.join(', ') + ")";
+					var insertID = Zotero.DB.query(sql, sqlValues);
+					if (!tagID) {
+						tagID = insertID;
+					}
+				}
+				else {
+					var sql = "UPDATE tags SET " + columns.join("=?, ") + "=?"
+						+ " WHERE tagID=?";
+					Zotero.DB.query(sql, sqlValues);
+				}
+				
+				// TEMP: until getLinkedItems() returns only arrays
+				linked = linked ? linked : [];
+				var linked2 = this.getLinkedItems(true);
+				linked2 = linked2 ? linked2 : [];
+				linked = linked.concat(linked2);
+				
+				this.linkedItems = Zotero.Utilities.arrayUnique(linked);
+			}
+			else {
 				throw (e);
 			}
 		}