www

commit c430baa85dd42996311008738d49649b08106e67
parent ed60df41adeb0bda84c717d01187ad1ccd4381cf
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue,  8 Jul 2008 15:02:14 +0000

Fix tag migration error ("oldIDs.map is not a function")


Diffstat:
M
chrome/content/zotero/xpcom/schema.js
 | 
12
++++--------

1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
@@ -1517,17 +1517,13 @@ Zotero.Schema = new function(){
 							var types = Zotero.DB.columnQuery("SELECT DISTINCT tagType FROM tags WHERE tag LIKE ?", l);
 							for each(var type in types) {
 								var newTagID = Zotero.DB.valueQuery("SELECT tagID FROM tags WHERE tag=? AND tagType=?", [newTag, type]);
-								var oldIDs = Zotero.DB.columnQuery("SELECT tagID FROM tags WHERE tag LIKE ? AND tag != ? AND tagType=?", [l, l, type]);
-								if (!newTagID) {
-									if (oldIDs) {
+								var oldIDs = Zotero.DB.columnQuery("SELECT tagID FROM tags WHERE tag LIKE ? AND tag != ? AND tagType=?", [l, newTag, type]);
+								if (oldIDs) {
+									if (!newTagID) {
 										newTagID = oldIDs[0];
 									}
-									else {
-										newTagID = Zotero.DB.valueQuery("SELECT MAX(tagID)+1 FROM tags");
-										Zotero.DB.query("INSERT INTO tags VALUES (?,?,?)", [newTagID, newTag, type]);
-									}
+									Zotero.DB.query("UPDATE OR REPLACE itemTags SET tagID=? WHERE tagID IN (" + oldIDs.map(function () '?').join() + ")", [newTagID].concat(oldIDs));
 								}
-								Zotero.DB.query("UPDATE OR REPLACE itemTags SET tagID=? WHERE tagID IN (" + oldIDs.map(function () '?').join() + ")", [newTagID].concat(oldIDs));
 								newTags.push({ tagID: newTagID, tag: newTag, tagType: type });
 							}
 						}