Closes #117, permit dashes and commas in "pages" field
Closes #118, add "translator" creator type Closes #122, add DOI and abbreviated journal title fields Addresses #45, reorder item fields -- source/rights moved down to bottom; date fields not yet moved
This commit is contained in:
parent
9da1c210a0
commit
526d368aaf
3 changed files with 18 additions and 12 deletions
|
@ -391,7 +391,7 @@ Scholar.Schema = new function(){
|
|||
//
|
||||
// Change this value to match the schema version
|
||||
//
|
||||
var toVersion = 30;
|
||||
var toVersion = 31;
|
||||
|
||||
if (toVersion != _getSchemaSQLVersion()){
|
||||
throw('Schema version does not match version in _migrateSchema()');
|
||||
|
@ -407,17 +407,15 @@ Scholar.Schema = new function(){
|
|||
// previous revision to that one.
|
||||
for (var i=fromVersion + 1; i<=toVersion; i++){
|
||||
if (i==30){
|
||||
Scholar.DB.query("DROP TABLE IF EXISTS keywords");
|
||||
Scholar.DB.query("DROP TABLE IF EXISTS itemKeywords");
|
||||
Scholar.DB.query("DROP TABLE IF EXISTS scrapers");
|
||||
|
||||
// Remove old SQLite DB
|
||||
var file = Scholar.getProfileDirectory();
|
||||
file.append('scholar.sqlite');
|
||||
if (file.exists()){
|
||||
file.remove(null);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (i==31){
|
||||
_initializeSchema();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -53,6 +53,8 @@ itemFields.url = URL
|
|||
itemFields.type = Type
|
||||
itemFields.callNumber = Call Number
|
||||
itemFields.extra = Extra
|
||||
itemFields.journalAbbreviation = Journal Abbreviation
|
||||
itemFields.DOIName = DOI Name
|
||||
|
||||
itemTypes.note = Note
|
||||
itemTypes.book = Book
|
||||
|
@ -72,6 +74,7 @@ itemTypes.file = File
|
|||
creatorTypes.author = Author
|
||||
creatorTypes.contributor = Contributor
|
||||
creatorTypes.editor = Editor
|
||||
creatorTypes.translator = Translator
|
||||
|
||||
ingester.scraping = Saving Item...
|
||||
ingester.scrapeComplete = Item Saved.
|
||||
|
|
17
schema.sql
17
schema.sql
|
@ -1,4 +1,4 @@
|
|||
-- 30
|
||||
-- 31
|
||||
|
||||
DROP TABLE IF EXISTS version;
|
||||
CREATE TABLE version (
|
||||
|
@ -261,7 +261,7 @@
|
|||
INSERT INTO fields VALUES (7,'place',NULL);
|
||||
INSERT INTO fields VALUES (8,'publisher',NULL);
|
||||
INSERT INTO fields VALUES (9,'year',3);
|
||||
INSERT INTO fields VALUES (10,'pages',2);
|
||||
INSERT INTO fields VALUES (10,'pages',NULL);
|
||||
INSERT INTO fields VALUES (11,'ISBN',NULL);
|
||||
INSERT INTO fields VALUES (12,'publication',NULL);
|
||||
INSERT INTO fields VALUES (13,'ISSN',NULL);
|
||||
|
@ -276,6 +276,8 @@
|
|||
INSERT INTO fields VALUES (22,'extra',NULL);
|
||||
INSERT INTO fields VALUES (23,'url',NULL);
|
||||
INSERT INTO fields VALUES (24,'type',NULL);
|
||||
INSERT INTO fields VALUES (25,'journalAbbreviation',NULL);
|
||||
INSERT INTO fields VALUES (26,'DOIName',NULL);
|
||||
|
||||
INSERT INTO "itemTypeFields" VALUES(2, 1, 1);
|
||||
INSERT INTO "itemTypeFields" VALUES(2, 2, 2);
|
||||
|
@ -294,7 +296,7 @@
|
|||
INSERT INTO "itemTypeFields" VALUES(4, 4, 4);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 5, 5);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 10, 6);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 13, 7);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 13, 9);
|
||||
INSERT INTO "itemTypeFields" VALUES(3, 1, 1);
|
||||
INSERT INTO "itemTypeFields" VALUES(3, 2, 2);
|
||||
INSERT INTO "itemTypeFields" VALUES(3, 12, 3);
|
||||
|
@ -369,9 +371,9 @@
|
|||
INSERT INTO "itemTypeFields" VALUES(10, 17, 6);
|
||||
INSERT INTO "itemTypeFields" VALUES(10, 18, 5);
|
||||
INSERT INTO "itemTypeFields" VALUES(10, 22, 7);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 17, 9);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 18, 8);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 22, 10);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 17, 11);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 18, 10);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 22, 12);
|
||||
INSERT INTO "itemTypeFields" VALUES(8, 17, 6);
|
||||
INSERT INTO "itemTypeFields" VALUES(8, 18, 5);
|
||||
INSERT INTO "itemTypeFields" VALUES(8, 22, 7);
|
||||
|
@ -387,6 +389,8 @@
|
|||
INSERT INTO "itemTypeFields" VALUES(7, 18, 7);
|
||||
INSERT INTO "itemTypeFields" VALUES(7, 22, 9);
|
||||
INSERT INTO "itemTypeFields" VALUES(13, 22, 5);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 25, 7);
|
||||
INSERT INTO "itemTypeFields" VALUES(4, 26, 8);
|
||||
|
||||
INSERT INTO "charsets" VALUES(1, 'utf-8');
|
||||
INSERT INTO "charsets" VALUES(2, 'ascii');
|
||||
|
@ -587,6 +591,7 @@
|
|||
INSERT INTO "creatorTypes" VALUES(1, "author");
|
||||
INSERT INTO "creatorTypes" VALUES(2, "contributor");
|
||||
INSERT INTO "creatorTypes" VALUES(3, "editor");
|
||||
INSERT INTO "creatorTypes" VALUES(4, "translator");
|
||||
|
||||
INSERT INTO "creators" VALUES(1, 'Susan B.', 'Barnes');
|
||||
INSERT INTO "creators" VALUES(2, 'J.S.', 'Bassard');
|
||||
|
|
Loading…
Add table
Reference in a new issue