diff --git a/chrome/chromeFiles/content/scholar/about.xul b/chrome/chromeFiles/content/scholar/about.xul
index 90ad4f6119..8274d5b68f 100644
--- a/chrome/chromeFiles/content/scholar/about.xul
+++ b/chrome/chromeFiles/content/scholar/about.xul
@@ -29,13 +29,19 @@
]]>
+
+
-
-
+
+
+
+
diff --git a/chrome/chromeFiles/content/scholar/include.js b/chrome/chromeFiles/content/scholar/include.js
index 2ab2956790..296af86420 100644
--- a/chrome/chromeFiles/content/scholar/include.js
+++ b/chrome/chromeFiles/content/scholar/include.js
@@ -1,5 +1,5 @@
-var Scholar = Components.classes["@chnm.gmu.edu/Scholar;1"]
+var Scholar = Components.classes["@chnm.gmu.edu/Zotero;1"]
// Currently uses only nsISupports
- //.getService(Components.interfaces.chnmIScholarService).
+ //.getService(Components.interfaces.chnmIZoteroService).
.getService(Components.interfaces.nsISupports)
.wrappedJSObject;
diff --git a/chrome/chromeFiles/content/scholar/itemPane.js b/chrome/chromeFiles/content/scholar/itemPane.js
index a1cbd8919a..6bd75a3708 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.js
+++ b/chrome/chromeFiles/content/scholar/itemPane.js
@@ -4,7 +4,7 @@
http://chnm.gmu.edu/
*/
-ScholarItemPane = new function()
+var ScholarItemPane = new function()
{
var _dynamicFields;
var _creatorTypeMenu;
diff --git a/chrome/chromeFiles/content/scholar/xpcom/schema.js b/chrome/chromeFiles/content/scholar/xpcom/schema.js
index 4edf804ec9..fc01dca303 100644
--- a/chrome/chromeFiles/content/scholar/xpcom/schema.js
+++ b/chrome/chromeFiles/content/scholar/xpcom/schema.js
@@ -401,7 +401,7 @@ Scholar.Schema = new function(){
//
// Change this value to match the schema version
//
- var toVersion = 43;
+ var toVersion = 44;
if (toVersion != _getSchemaSQLVersion()){
throw('Schema version does not match version in _migrateSchema()');
@@ -425,7 +425,7 @@ Scholar.Schema = new function(){
}
}
- if (i==43){
+ if (i==44){
// Clear storage directory
var file = Scholar.getStorageDirectory();
if (file.exists()){
diff --git a/chrome/chromeFiles/content/scholar/xpcom/scholar.js b/chrome/chromeFiles/content/scholar/xpcom/scholar.js
index bb99a0eaaa..e2c7ffc961 100644
--- a/chrome/chromeFiles/content/scholar/xpcom/scholar.js
+++ b/chrome/chromeFiles/content/scholar/xpcom/scholar.js
@@ -1,6 +1,6 @@
const SCHOLAR_CONFIG = {
- GUID: 'scholar@chnm.gmu.edu',
- DB_FILE: 'scholar.sqlite',
+ GUID: 'zotero@chnm.gmu.edu',
+ DB_FILE: 'zotero.sqlite',
DB_REBUILD: false, // erase DB and recreate from schema
DEBUG_LOGGING: true,
DEBUG_TO_CONSOLE: true, // dump debug messages to console rather than (much slower) Debug Logger
@@ -117,7 +117,7 @@ var Scholar = new function(){
function getScholarDirectory(){
var file = Scholar.getProfileDirectory();
- file.append('scholar');
+ file.append('zotero');
// If it doesn't exist, create
if (!file.exists() || !file.isDirectory()){
file.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755);
@@ -216,7 +216,7 @@ var Scholar = new function(){
var logManager =
Components.classes["@mozmonkey.com/debuglogger/manager;1"]
.getService(Components.interfaces.nsIDebugLoggerManager);
- var logger = logManager.registerLogger("Scholar for Firefox");
+ var logger = logManager.registerLogger("Zotero");
}
catch (e){}
}
@@ -225,7 +225,7 @@ var Scholar = new function(){
logger.log(level, message);
}
else {
- dump('scholar(' + level + '): ' + message + "\n\n");
+ dump('zotero(' + level + '): ' + message + "\n\n");
}
return true;
}
diff --git a/chrome/chromeFiles/locale/en-US/scholar/about.dtd b/chrome/chromeFiles/locale/en-US/scholar/about.dtd
index a7940ced07..fe1b216536 100644
--- a/chrome/chromeFiles/locale/en-US/scholar/about.dtd
+++ b/chrome/chromeFiles/locale/en-US/scholar/about.dtd
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/chrome/chromeFiles/locale/en-US/scholar/preferences.dtd b/chrome/chromeFiles/locale/en-US/scholar/preferences.dtd
index 1f02eef504..90bc5a37ae 100644
--- a/chrome/chromeFiles/locale/en-US/scholar/preferences.dtd
+++ b/chrome/chromeFiles/locale/en-US/scholar/preferences.dtd
@@ -1,11 +1,11 @@
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd b/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
index df979ee54e..6eafe549a0 100644
--- a/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
+++ b/chrome/chromeFiles/locale/en-US/scholar/scholar.dtd
@@ -1,4 +1,4 @@
-
+
diff --git a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
index c57b01e1f0..d36ce57472 100644
--- a/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
+++ b/chrome/chromeFiles/locale/en-US/scholar/scholar.properties
@@ -90,9 +90,9 @@ ingester.scrapeComplete = Item Saved.
ingester.scrapeError = Could Not Save Item.
ingester.scrapeErrorDescription = An error occurred while saving this item. Please try again. If this error persists, contact the translator author.
-db.dbCorruptedNoBackup = The Scholar database appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved in your Scholar directory.
-db.dbRestored = The Scholar database appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %1 at %2. The damaged file was saved in your Scholar directory.
-db.dbRestoreFailed = The Scholar database appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved in your Scholar directory.
+db.dbCorruptedNoBackup = The Zotero database appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
+db.dbRestored = The Zotero database appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %1 at %2. The damaged file was saved in your Zotero directory.
+db.dbRestoreFailed = The Zotero database appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
fileInterface.itemsImported = Importing items...
fileInterface.itemsExported = Exporting items...
diff --git a/components/chnmIScholarService.js b/components/chnmIZoteroService.js
similarity index 97%
rename from components/chnmIScholarService.js
rename to components/chnmIZoteroService.js
index 6d78e820ae..b82101d445 100644
--- a/components/chnmIScholarService.js
+++ b/components/chnmIZoteroService.js
@@ -1,7 +1,7 @@
-const SCHOLAR_CONTRACTID = '@chnm.gmu.edu/Scholar;1';
-const SCHOLAR_CLASSNAME = 'Scholar for Firefox';
+const SCHOLAR_CONTRACTID = '@chnm.gmu.edu/Zotero;1';
+const SCHOLAR_CLASSNAME = 'Zotero';
const SCHOLAR_CID = Components.ID('{e4c61080-ec2d-11da-8ad9-0800200c9a66}');
-const SCHOLAR_IID = Components.interfaces.chnmIScholarService;
+const SCHOLAR_IID = Components.interfaces.chnmIZoteroService;
const Cc = Components.classes;
const Ci = Components.interfaces;
diff --git a/install.rdf b/install.rdf
index 37c1ae1904..14fbca01b6 100644
--- a/install.rdf
+++ b/install.rdf
@@ -4,17 +4,17 @@
- scholar@chnm.gmu.edu
- Scholar
- 1.0a1.SVN
- A bibliographic management and note-taking tool
+ zotero@chnm.gmu.edu
+ Zotero
+ 1.0b1.SVN
+ The Next-Generation Research ToolCenter for History and New Media George Mason UniversityDan CohenJosh GreenbergSimon KornblithDavid NortonDan Stillman
- http://chnm.gmu.edu/tools/firefoxscholar/
+ http://chnm.gmu.edu/tools/zotero/chrome://scholar/content/preferences.xulchrome://scholar/content/about.xulchrome://scholar/skin/mainicon.png
diff --git a/update.rdf b/update.rdf
index 4387a7f59c..53ac3db5fd 100644
--- a/update.rdf
+++ b/update.rdf
@@ -1,13 +1,35 @@
-
-
+
+
- 1.0a1.SVN
+ 1.0b1.SVN
+
+
+ {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+ 2.0a1+
+ 3.0+
+ http://chnm.gmu.edu/firefoxscholar/download/scholar.xpi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.0b1.SVN{ec8030f7-c20a-464f-9b0e-13a3a9e97384}