www

commit 9a897e15e871e78c983595a44f42a800693aff37
parent 1bed666f2139169792d57b33dd03e21a52e8ae74
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu, 24 Aug 2006 20:33:29 +0000

Closes #205, eliminate "source" field, and add "url" field on all item types


Diffstat:
M
chrome/chromeFiles/content/scholar/xpcom/schema.js
 | 
4
++--
M
schema.sql
 | 
52
+++++++++++++++++++++++++++-------------------------

2 files changed, 29 insertions(+), 27 deletions(-)
diff --git 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 = 40;
+		var toVersion = 41;
 		
 		if (toVersion != _getSchemaSQLVersion()){
 			throw('Schema version does not match version in _migrateSchema()');
@@ -425,7 +425,7 @@ Scholar.Schema = new function(){
 				}
 			}
 			
-			if (i==40){
+			if (i==41){
 				// Clear storage directory
 				var file = Scholar.getStorageDirectory();
 				if (file.exists()){
diff --git a/schema.sql b/schema.sql
@@ -1,4 +1,4 @@
--- 40
+-- 41
 
     DROP TABLE IF EXISTS version;
     CREATE TABLE version (
@@ -296,7 +296,7 @@
     INSERT INTO "fieldFormats" VALUES(2, '[0-9]*', 1);
     INSERT INTO "fieldFormats" VALUES(3, '[0-9]{4}', 1);
     
-    INSERT INTO fields VALUES (1,'source',NULL);
+    INSERT INTO fields VALUES (1,'url',NULL);
     INSERT INTO fields VALUES (2,'rights',NULL);
     INSERT INTO fields VALUES (3,'series',NULL);
     INSERT INTO fields VALUES (4,'volume',NULL);
@@ -318,7 +318,7 @@
     INSERT INTO fields VALUES (20,'medium',NULL);
     INSERT INTO fields VALUES (21,'distributor',NULL);
     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,'DOI',NULL);
@@ -327,8 +327,8 @@
     INSERT INTO fields VALUES (29,'seriesText',NULL);
     INSERT INTO fields VALUES (30,'seriesNumber',NULL);
     
-    INSERT INTO "itemTypeFields" VALUES(2, 1, 13);
-    INSERT INTO "itemTypeFields" VALUES(2, 2, 14);
+    INSERT INTO "itemTypeFields" VALUES(2, 1, 14);
+    INSERT INTO "itemTypeFields" VALUES(2, 2, 13);
     INSERT INTO "itemTypeFields" VALUES(2, 3, 1);
     INSERT INTO "itemTypeFields" VALUES(2, 4, 3);
     INSERT INTO "itemTypeFields" VALUES(2, 5, 4);
@@ -337,15 +337,15 @@
     INSERT INTO "itemTypeFields" VALUES(2, 8, 7);
     INSERT INTO "itemTypeFields" VALUES(2, 10, 9);
     INSERT INTO "itemTypeFields" VALUES(2, 11, 10);
-    INSERT INTO "itemTypeFields" VALUES(4, 1, 14);
-    INSERT INTO "itemTypeFields" VALUES(4, 2, 15);
+    INSERT INTO "itemTypeFields" VALUES(4, 1, 15);
+    INSERT INTO "itemTypeFields" VALUES(4, 2, 14);
     INSERT INTO "itemTypeFields" VALUES(4, 12, 1);
     INSERT INTO "itemTypeFields" VALUES(4, 4, 2);
     INSERT INTO "itemTypeFields" VALUES(4, 5, 3);
     INSERT INTO "itemTypeFields" VALUES(4, 10, 4);
     INSERT INTO "itemTypeFields" VALUES(4, 13, 11);
-    INSERT INTO "itemTypeFields" VALUES(3, 1, 14);
-    INSERT INTO "itemTypeFields" VALUES(3, 2, 15);
+    INSERT INTO "itemTypeFields" VALUES(3, 1, 15);
+    INSERT INTO "itemTypeFields" VALUES(3, 2, 14);
     INSERT INTO "itemTypeFields" VALUES(3, 12, 1);
     INSERT INTO "itemTypeFields" VALUES(3, 3, 2);
     INSERT INTO "itemTypeFields" VALUES(3, 4, 4);
@@ -355,22 +355,22 @@
     INSERT INTO "itemTypeFields" VALUES(3, 8, 8);
     INSERT INTO "itemTypeFields" VALUES(3, 10, 10);
     INSERT INTO "itemTypeFields" VALUES(3, 11, 11);
-    INSERT INTO "itemTypeFields" VALUES(5, 1, 7);
-    INSERT INTO "itemTypeFields" VALUES(5, 2, 8);
+    INSERT INTO "itemTypeFields" VALUES(5, 1, 8);
+    INSERT INTO "itemTypeFields" VALUES(5, 2, 7);
     INSERT INTO "itemTypeFields" VALUES(5, 12, 1);
     INSERT INTO "itemTypeFields" VALUES(5, 14, 2);
     INSERT INTO "itemTypeFields" VALUES(5, 10, 3);
     INSERT INTO "itemTypeFields" VALUES(5, 13, 4);
-    INSERT INTO "itemTypeFields" VALUES(6, 1, 9);
-    INSERT INTO "itemTypeFields" VALUES(6, 2, 10);
+    INSERT INTO "itemTypeFields" VALUES(6, 1, 10);
+    INSERT INTO "itemTypeFields" VALUES(6, 2, 9);
     INSERT INTO "itemTypeFields" VALUES(6, 12, 1);
     INSERT INTO "itemTypeFields" VALUES(6, 6, 2);
     INSERT INTO "itemTypeFields" VALUES(6, 14, 3);
     INSERT INTO "itemTypeFields" VALUES(6, 15, 4);
     INSERT INTO "itemTypeFields" VALUES(6, 10, 5);
     INSERT INTO "itemTypeFields" VALUES(6, 13, 6);
-    INSERT INTO "itemTypeFields" VALUES(7, 1, 7);
-    INSERT INTO "itemTypeFields" VALUES(7, 2, 8);
+    INSERT INTO "itemTypeFields" VALUES(7, 1, 8);
+    INSERT INTO "itemTypeFields" VALUES(7, 2, 7);
     INSERT INTO "itemTypeFields" VALUES(7, 8, 1);
     INSERT INTO "itemTypeFields" VALUES(7, 16, 2);
     INSERT INTO "itemTypeFields" VALUES(7, 10, 4);
@@ -379,8 +379,8 @@
     INSERT INTO "itemTypeFields" VALUES(8, 24, 1);
     INSERT INTO "itemTypeFields" VALUES(8, 14, 2);
     INSERT INTO "itemTypeFields" VALUES(8, 19, 3);
-    INSERT INTO "itemTypeFields" VALUES(9, 1, 7);
-    INSERT INTO "itemTypeFields" VALUES(9, 2, 8);
+    INSERT INTO "itemTypeFields" VALUES(9, 1, 8);
+    INSERT INTO "itemTypeFields" VALUES(9, 2, 7);
     INSERT INTO "itemTypeFields" VALUES(9, 24, 1);
     INSERT INTO "itemTypeFields" VALUES(9, 7, 2);
     INSERT INTO "itemTypeFields" VALUES(9, 14, 3);
@@ -389,15 +389,15 @@
     INSERT INTO "itemTypeFields" VALUES(10, 14, 1);
     INSERT INTO "itemTypeFields" VALUES(10, 20, 2);
     INSERT INTO "itemTypeFields" VALUES(10, 19, 3);
-    INSERT INTO "itemTypeFields" VALUES(11, 1, 5);
-    INSERT INTO "itemTypeFields" VALUES(11, 2, 6);
+    INSERT INTO "itemTypeFields" VALUES(11, 1, 6);
+    INSERT INTO "itemTypeFields" VALUES(11, 2, 5);
     INSERT INTO "itemTypeFields" VALUES(11, 21, 1);
-    INSERT INTO "itemTypeFields" VALUES(12, 1, 5);
-    INSERT INTO "itemTypeFields" VALUES(12, 2, 6);
+    INSERT INTO "itemTypeFields" VALUES(12, 1, 6);
+    INSERT INTO "itemTypeFields" VALUES(12, 2, 5);
     INSERT INTO "itemTypeFields" VALUES(12, 24, 1);
     INSERT INTO "itemTypeFields" VALUES(12, 14, 2);
-    INSERT INTO "itemTypeFields" VALUES(13, 1, 4);
-    INSERT INTO "itemTypeFields" VALUES(13, 2, 5);
+    INSERT INTO "itemTypeFields" VALUES(13, 1, 5);
+    INSERT INTO "itemTypeFields" VALUES(13, 2, 4);
     INSERT INTO "itemTypeFields" VALUES(13, 23, 1);
     INSERT INTO "itemTypeFields" VALUES(12, 18, 3);
     INSERT INTO "itemTypeFields" VALUES(2, 18, 11);
@@ -413,13 +413,13 @@
     INSERT INTO "itemTypeFields" VALUES(11, 22, 7);
     INSERT INTO "itemTypeFields" VALUES(10, 17, 5);
     INSERT INTO "itemTypeFields" VALUES(10, 18, 4);
-    INSERT INTO "itemTypeFields" VALUES(10, 22, 7);
+    INSERT INTO "itemTypeFields" VALUES(10, 22, 8);
     INSERT INTO "itemTypeFields" VALUES(4, 17, 13);
     INSERT INTO "itemTypeFields" VALUES(4, 18, 12);
     INSERT INTO "itemTypeFields" VALUES(4, 22, 16);
     INSERT INTO "itemTypeFields" VALUES(8, 17, 5);
     INSERT INTO "itemTypeFields" VALUES(8, 18, 4);
-    INSERT INTO "itemTypeFields" VALUES(8, 22, 7);
+    INSERT INTO "itemTypeFields" VALUES(8, 22, 8);
     INSERT INTO "itemTypeFields" VALUES(5, 17, 6);
     INSERT INTO "itemTypeFields" VALUES(5, 18, 5);
     INSERT INTO "itemTypeFields" VALUES(5, 22, 9);
@@ -446,6 +446,8 @@
     INSERT INTO "itemTypeFields" VALUES(4, 3, 6);
     INSERT INTO "itemTypeFields" VALUES(4, 29, 8);
     INSERT INTO "itemTypeFields" VALUES(4, 28, 7);
+    INSERT INTO "itemTypeFields" VALUES(8, 1, 7);
+    INSERT INTO "itemTypeFields" VALUES(10, 1, 7);
     
     INSERT INTO "fileTypes" VALUES(1, 'webpage');
     INSERT INTO "fileTypes" VALUES(2, 'image');