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

- Purge tags immediately on delete from tag selector

Browse source 
- Adds optional tagIDs parameter to Zotero.Tags.purge()
This commit is contained in:
Dan Stillman 2010-01-27 10:39:35 +00:00
parent 244c411c11
commit a5329880d7
2 changed files with 38 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
chrome/content/zotero/bindings/tagselector.xml
View file

@ -682,6 +682,7 @@
}
Zotero.Tags.erase(tagIDs);
Zotero.Tags.purge(tagIDs);
Zotero.DB.commitTransaction()
}

57
chrome/content/zotero/xpcom/data/tags.js
View file

@ -399,37 +399,54 @@ Zotero.Tags = new function() {
}
/*
/**
* Delete obsolete tags from database and clear internal array entries
*
* Returns removed tagIDs on success
* @param [Integer[]|Integer] [tagIDs] tagID or array of tagIDs to purge
*/
function purge() {
if (!Zotero.Prefs.get('purge.tags')) {
function purge(tagIDs) {
if (!tagIDs && !Zotero.Prefs.get('purge.tags')) {
return;
}
if (tagIDs) {
tagIDs = Zotero.flattenArguments(tagIDs);
}
Zotero.UnresponsiveScriptIndicator.disable();
try {
Zotero.DB.beginTransaction();
var sql = "CREATE TEMPORARY TABLE tagDelete AS "
+ "SELECT tagID FROM tags WHERE tagID "
+ "NOT IN (SELECT tagID FROM itemTags)";
Zotero.DB.query(sql);
sql = "CREATE INDEX tagDelete_tagID ON tagDelete(tagID)";
Zotero.DB.query(sql);
sql = "SELECT * FROM tagDelete";
var toDelete = Zotero.DB.columnQuery(sql);
if (!toDelete) {
sql = "DROP TABLE tagDelete";
// Use given tags
if (tagIDs) {
var sql = "CREATE TEMPORARY TABLE tagDelete (tagID INT PRIMARY KEY)";
Zotero.DB.query(sql);
Zotero.DB.commitTransaction();
Zotero.Prefs.set('purge.tags', false);
return;
for each(var id in tagIDs) {
Zotero.DB.query("INSERT OR IGNORE INTO tagDelete VALUES (?)", id);
}
// Remove duplicates
var toDelete = Zotero.DB.columnQuery("SELECT * FROM tagDelete");
}
// Look for orphaned tags
else {
var sql = "CREATE TEMPORARY TABLE tagDelete AS "
+ "SELECT tagID FROM tags WHERE tagID "
+ "NOT IN (SELECT tagID FROM itemTags)";
Zotero.DB.query(sql);
sql = "CREATE INDEX tagDelete_tagID ON tagDelete(tagID)";
Zotero.DB.query(sql);
sql = "SELECT * FROM tagDelete";
var toDelete = Zotero.DB.columnQuery(sql);
if (!toDelete) {
sql = "DROP TABLE tagDelete";
Zotero.DB.query(sql);
Zotero.DB.commitTransaction();
Zotero.Prefs.set('purge.tags', false);
return;
}
}
var notifierData = {};