From e45520b8710d13b73f56417b4ef96a7a8fd6f518 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 28 Jun 2006 19:12:35 +0000 Subject: [PATCH] Updated obsolete references to itemKeywords table to use itemTags (this was breaking item delete and search) --- chrome/chromeFiles/content/scholar/xpcom/data_access.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/chromeFiles/content/scholar/xpcom/data_access.js b/chrome/chromeFiles/content/scholar/xpcom/data_access.js index 0becb85ac5..34e91dd81f 100644 --- a/chrome/chromeFiles/content/scholar/xpcom/data_access.js +++ b/chrome/chromeFiles/content/scholar/xpcom/data_access.js @@ -1025,7 +1025,7 @@ Scholar.Item.prototype.erase = function(){ sql = 'DELETE FROM itemCreators WHERE itemID=' + this.getID() + ";\n"; sql += 'DELETE FROM itemNotes WHERE itemID=' + this.getID() + ";\n"; - sql += 'DELETE FROM itemKeywords WHERE itemID=' + this.getID() + ";\n"; + sql += 'DELETE FROM itemTags WHERE itemID=' + this.getID() + ";\n"; sql += 'DELETE FROM itemData WHERE itemID=' + this.getID() + ";\n"; sql += 'DELETE FROM items WHERE itemID=' + this.getID() + ";\n"; @@ -1351,8 +1351,8 @@ Scholar.Items = new function(){ + "SELECT itemID FROM itemCreators WHERE creatorID IN " + "(SELECT creatorID FROM creators WHERE firstName LIKE ?1 " + "OR lastName LIKE ?1) UNION " - + "SELECT itemID FROM itemKeywords WHERE keywordID IN " - + "(SELECT keywordID FROM keywords WHERE keyword LIKE ?1) UNION " + + "SELECT itemID FROM itemTags WHERE tagID IN " + + "(SELECT tagID FROM tags WHERE tag LIKE ?1) UNION " + "SELECT itemID FROM itemNotes WHERE note LIKE ?1"; var sqlParams = [{'string':'%' + text + '%'}];