suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge [1660-1663] to 1.0.0rc3 tag

Browse Source
This commit is contained in:
Dan Stillman 2007-08-27 04:43:46 +00:00
parent 586cc777bd
commit d86dcabaaf
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chrome/content/zotero/overlay.js
View File

@ -182,7 +182,9 @@ var ZoteroPane = new function()
// they the DB is initialized erroneously (e.g. while switching data
// directory locations)
if (Zotero.Schema.dbInitialized && Zotero.Prefs.get('firstRun')) {
gBrowser.selectedTab = gBrowser.addTab('http://www.zotero.org/documentation/quick_start_guide');
setTimeout(function () {
gBrowser.selectedTab = gBrowser.addTab('http://www.zotero.org/documentation/quick_start_guide');
}, 400);
Zotero.Prefs.set('extensions.zotero.firstRun', false);
}
}

7
chrome/content/zotero/xpcom/schema.js
View File

@ -36,7 +36,7 @@ Zotero.Schema = new function(){
var _repositoryTimer;
var _remoteUpdateInProgress = false;
var _fulltextItemWordsCache = [];
var _fulltextItemWordsCache = null;
var self = this;
@ -151,6 +151,10 @@ Zotero.Schema = new function(){
}
insertStatement.reset();
Zotero.DB.commitTransaction();
Zotero.DB.beginTransaction();
Zotero.DB.query("INSERT INTO fulltextItems SELECT DISTINCT itemID, 1, NULL, NULL, NULL, NULL FROM fulltextItemWords");
Zotero.DB.commitTransaction();
}
catch (e) {
Zotero.debug(e);
@ -1164,7 +1168,6 @@ Zotero.Schema = new function(){
Zotero.DB.query("DROP TABLE fulltextItems");
Zotero.DB.query("CREATE TABLE fulltextItems (\n itemID INT,\n version INT,\n PRIMARY KEY (itemID),\n FOREIGN KEY (itemID) REFERENCES items(itemID)\n);");
Zotero.DB.query("INSERT INTO fulltextItems SELECT DISTINCT itemID, 1 FROM fulltextItemWords");
}
if (i==36) {