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

Add Dataset and Standard item types

Browse source 
zotero/zotero-bits#22
zotero/zotero-bits#52
This commit is contained in:
Dan Stillman 2023-03-23 01:02:01 -04:00
parent 6ac13e3281
commit e27c1b5335
12 changed files with 480 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/components/icons.jsx
View file

@ -124,6 +124,7 @@ i('TreeitemBookSection', 'chrome://zotero/skin/treeitem-bookSection.png');
i('TreeitemCase', 'chrome://zotero/skin/treeitem-case.png');
i('TreeitemComputerProgram', 'chrome://zotero/skin/treeitem-computerProgram.png');
i('TreeitemConferencePaper', 'chrome://zotero/skin/treeitem-conferencePaper.png');
i('TreeitemDataset', 'chrome://zotero/skin/treeitem-dataset.png');
i('TreeitemDictionaryEntry', 'chrome://zotero/skin/treeitem-dictionaryEntry.png');
i('TreeitemEmail', 'chrome://zotero/skin/treeitem-email.png');
i('TreeitemEncyclopediaArticle', 'chrome://zotero/skin/treeitem-encyclopediaArticle.png');
@ -147,6 +148,7 @@ i('TreeitemPreprint', 'chrome://zotero/skin/treeitem-preprint.png');
i('TreeitemPresentation', 'chrome://zotero/skin/treeitem-presentation.png');
i('TreeitemRadioBroadcast', 'chrome://zotero/skin/treeitem-radioBroadcast.png', false);
i('TreeitemReport', 'chrome://zotero/skin/treeitem-report.png');
i('TreeitemStandard', 'chrome://zotero/skin/treeitem-standard.png');
i('TreeitemStatute', 'chrome://zotero/skin/treeitem-statute.png');
i('TreeitemThesis', 'chrome://zotero/skin/treeitem-thesis.png');
i('TreeitemTvBroadcast', 'chrome://zotero/skin/treeitem-tvBroadcast.png', false);

2
chrome/content/zotero/xpcom/data/cachedTypes.js
View file

@ -470,6 +470,7 @@ Zotero.ItemTypes = new function() {
case 'case':
case 'computerProgram':
case 'conferencePaper':
case 'dataset':
case 'dictionaryEntry':
case 'email':
case 'encyclopediaArticle':
@ -488,6 +489,7 @@ Zotero.ItemTypes = new function() {
case 'preprint':
case 'presentation':
case 'report':
case 'standard':
case 'statute':
case 'thesis':
case 'webpage':

11
chrome/locale/en-US/zotero/zotero.properties
View file

@ -500,8 +500,10 @@ itemTypes.document = Document
itemTypes.encyclopediaArticle = Encyclopedia Article
itemTypes.dictionaryEntry = Dictionary Entry
itemTypes.preprint = Preprint
itemTypes.dataset = Dataset
itemTypes.standard = Standard
itemFields.itemType = Type
itemFields.itemType = Item Type
itemFields.title = Title
itemFields.dateAdded = Date Added
itemFields.dateModified = Modified
@ -614,8 +616,15 @@ itemFields.genre = Genre
itemFields.archive = Archive
itemFields.attachmentPDF = PDF Attachment
itemFields.repository = Repository
itemFields.repositoryLocation = Repo. Location
itemFields.archiveID = Archive ID
itemFields.citationKey = Citation Key
itemFields.identifier = Identifier
itemFields.type = Type
itemFields.format = Format
itemFields.status = Status
itemFields.organization = Organization
itemFields.authority = Authority
itemFields.feed = Feed
creatorTypes.author = Author

BIN
chrome/skin/default/zotero/treeitem-dataset.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 500 B

BIN
chrome/skin/default/zotero/treeitem-dataset@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 797 B

BIN
chrome/skin/default/zotero/treeitem-standard.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
chrome/skin/default/zotero/treeitem-standard@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

2
resource/schema/global

@ -1 +1 @@
Subproject commit c9f6c78a3d8199de62496c8dc7c188e74ac22341
Subproject commit 045659ea75581e915dd9a0d4c0a1ec48b312a3d5

93
test/tests/data/allTypesAndFields.js
View file

@ -286,7 +286,7 @@
"case": {
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",
"court": "Court",
"authority": "Authority",
"creators": [
{
"creatorType": "author",
@ -419,6 +419,47 @@
"url": "http://www.example.com",
"volume": 6
},
"dataset": {
"DOI": "10.1234/example.doi",
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",
"archive": "Archive",
"archiveLocation": "Archive location",
"callNumber": "Call number",
"citationKey": "Citation key",
"creators": [
{
"creatorType": "author",
"firstName": "authorFirst",
"lastName": "authorLast"
},
{
"creatorType": "contributor",
"firstName": "contributorFirst",
"lastName": "contributorLast"
},
{
"creatorType": "author",
"fieldMode": 1,
"lastName": "Institutional Author"
}
],
"date": "1999-12-31",
"extra": "Extra",
"itemType": "dataset",
"language": "en-US",
"libraryCatalog": "Library catalog",
"medium": "Medium",
"number": 3,
"place": "Place",
"publisher": "Publisher",
"rights": "Rights",
"shortTitle": "Short title",
"title": "Title",
"type": "Type",
"url": "http://www.example.com",
"versionNumber": "Version number"
},
"dictionaryEntry": {
"ISBN": "978-1-234-56789-7",
"abstractNote": "Abstract note",
@ -699,6 +740,7 @@
"hearing": {
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",
"authority": "Authority",
"committee": "Committee",
"creators": [
{
@ -717,7 +759,6 @@
"history": "History",
"itemType": "hearing",
"language": "en-US",
"legislativeBody": "Legislative body",
"number": 3,
"numberOfVolumes": 7,
"pages": "1-10",
@ -1092,6 +1133,7 @@
"accessDate": "1997-06-13T23:59:58Z",
"applicationNumber": "Application number",
"assignee": "Assignee",
"authority": "Authority",
"country": "Country",
"creators": [
{
@ -1118,10 +1160,8 @@
"date": "1999-12-31",
"extra": "Extra",
"filingDate": "2000-01-02",
"issuingAuthority": "Issuing authority",
"itemType": "patent",
"language": "en-US",
"legalStatus": "Legal status",
"number": 3,
"pages": "1-10",
"place": "Place",
@ -1129,6 +1169,7 @@
"references": "References",
"rights": "Rights",
"shortTitle": "Short title",
"status": "Status",
"title": "Title",
"url": "http://www.example.com"
},
@ -1365,6 +1406,50 @@
"type": "Type",
"url": "http://www.example.com"
},
"standard": {
"DOI": "10.1234/example.doi",
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",
"archive": "Archive",
"archiveLocation": "Archive location",
"authority": "Authority",
"callNumber": "Call number",
"citationKey": "Citation key",
"committee": "Committee",
"creators": [
{
"creatorType": "author",
"firstName": "authorFirst",
"lastName": "authorLast"
},
{
"creatorType": "contributor",
"firstName": "contributorFirst",
"lastName": "contributorLast"
},
{
"creatorType": "author",
"fieldMode": 1,
"lastName": "Institutional Author"
}
],
"date": "1999-12-31",
"extra": "Extra",
"itemType": "standard",
"language": "en-US",
"libraryCatalog": "Library catalog",
"numPages": 4,
"number": 3,
"place": "Place",
"publisher": "Publisher",
"rights": "Rights",
"shortTitle": "Short title",
"status": "Status",
"title": "Title",
"type": "Type",
"url": "http://www.example.com",
"versionNumber": "Version number"
},
"statute": {
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",

104
test/tests/data/itemJSON.js
View file

@ -324,7 +324,7 @@
"accessDate": "1997-06-13T23:59:58Z",
"caseName": "Title",
"collections": [],
"court": "Court",
"court": "Authority",
"creators": [
{
"creatorType": "author",
@ -473,6 +473,52 @@
"version": 0,
"volume": "6"
},
"dataset": {
"DOI": "10.1234/example.doi",
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",
"archive": "Archive",
"archiveLocation": "Archive location",
"callNumber": "Call number",
"citationKey": "Citation key",
"collections": [],
"creators": [
{
"creatorType": "author",
"firstName": "authorFirst",
"lastName": "authorLast"
},
{
"creatorType": "contributor",
"firstName": "contributorFirst",
"lastName": "contributorLast"
},
{
"creatorType": "author",
"name": "Institutional Author"
}
],
"date": "1999-12-31",
"dateAdded": "2023-03-23T05:19:49Z",
"dateModified": "2023-03-23T05:19:49Z",
"extra": "Extra",
"format": "Medium",
"itemType": "dataset",
"key": "F8CLJGM7",
"language": "en-US",
"libraryCatalog": "Library catalog",
"relations": {},
"repository": "Publisher",
"repositoryLocation": "Place",
"rights": "Rights",
"shortTitle": "Short title",
"tags": [],
"title": "Title",
"type": "Type",
"url": "http://www.example.com",
"version": 0,
"versionNumber": "Version number"
},
"dictionaryEntry": {
"ISBN": "978-1-234-56789-7",
"abstractNote": "Abstract note",
@ -811,7 +857,7 @@
"itemType": "hearing",
"key": "G2NRUQUQ",
"language": "en-US",
"legislativeBody": "Legislative body",
"legislativeBody": "Authority",
"numberOfVolumes": "7",
"pages": "1-10",
"place": "Place",
@ -1264,11 +1310,11 @@
"extra": "Extra",
"filingDate": "2000-01-02",
"issueDate": "1999-12-31",
"issuingAuthority": "Issuing authority",
"issuingAuthority": "Authority",
"itemType": "patent",
"key": "MTZVXTRG",
"language": "en-US",
"legalStatus": "Legal status",
"legalStatus": "Status",
"pages": "1-10",
"patentNumber": "3",
"place": "Place",
@ -1545,6 +1591,56 @@
"url": "http://www.example.com",
"version": 0
},
"standard": {
"DOI": "10.1234/example.doi",
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",
"archive": "Archive",
"archiveLocation": "Archive location",
"callNumber": "Call number",
"citationKey": "Citation key",
"collections": [],
"committee": "Committee",
"creators": [
{
"creatorType": "author",
"firstName": "authorFirst",
"lastName": "authorLast"
},
{
"creatorType": "contributor",
"firstName": "contributorFirst",
"lastName": "contributorLast"
},
{
"creatorType": "author",
"name": "Institutional Author"
}
],
"date": "1999-12-31",
"dateAdded": "2023-03-23T05:19:49Z",
"dateModified": "2023-03-23T05:19:49Z",
"extra": "Extra",
"itemType": "standard",
"key": "V62THKLP",
"language": "en-US",
"libraryCatalog": "Library catalog",
"numPages": "4",
"number": "3",
"organization": "Authority",
"place": "Place",
"publisher": "Publisher",
"relations": {},
"rights": "Rights",
"shortTitle": "Short title",
"status": "Status",
"tags": [],
"title": "Title",
"type": "Type",
"url": "http://www.example.com",
"version": 0,
"versionNumber": "Version number"
},
"statute": {
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",

108
test/tests/data/translatorExport.js
View file

@ -337,7 +337,7 @@
"attachments": [],
"caseName": "Title",
"collections": [],
"court": "Court",
"court": "Authority",
"creators": [
{
"creatorType": "author",
@ -491,6 +491,54 @@
"version": 0,
"volume": "6"
},
"dataset": {
"DOI": "10.1234/example.doi",
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",
"archive": "Archive",
"archiveLocation": "Archive location",
"attachments": [],
"callNumber": "Call number",
"citationKey": "Citation key",
"collections": [],
"creators": [
{
"creatorType": "author",
"firstName": "authorFirst",
"lastName": "authorLast"
},
{
"creatorType": "contributor",
"firstName": "contributorFirst",
"lastName": "contributorLast"
},
{
"creatorType": "author",
"name": "Institutional Author"
}
],
"date": "1999-12-31",
"dateAdded": "2023-03-23T05:19:51Z",
"dateModified": "2023-03-23T05:19:51Z",
"extra": "Extra",
"format": "Medium",
"itemType": "dataset",
"language": "en-US",
"libraryCatalog": "Library catalog",
"notes": [],
"relations": {},
"repository": "Publisher",
"repositoryLocation": "Place",
"rights": "Rights",
"shortTitle": "Short title",
"tags": [],
"title": "Title",
"type": "Type",
"uri": "http://zotero.org/users/local/35kRWXym/items/Y7VY3S4B",
"url": "http://www.example.com",
"version": 0,
"versionNumber": "Version number"
},
"dictionaryEntry": {
"ISBN": "978-1-234-56789-7",
"abstractNote": "Abstract note",
@ -841,7 +889,7 @@
"history": "History",
"itemType": "hearing",
"language": "en-US",
"legislativeBody": "Legislative body",
"legislativeBody": "Authority",
"notes": [],
"numberOfVolumes": "7",
"pages": "1-10",
@ -1313,10 +1361,10 @@
"extra": "Extra",
"filingDate": "2000-01-02",
"issueDate": "1999-12-31",
"issuingAuthority": "Issuing authority",
"issuingAuthority": "Authority",
"itemType": "patent",
"language": "en-US",
"legalStatus": "Legal status",
"legalStatus": "Status",
"notes": [],
"pages": "1-10",
"patentNumber": "3",
@ -1605,6 +1653,58 @@
"url": "http://www.example.com",
"version": 0
},
"standard": {
"DOI": "10.1234/example.doi",
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",
"archive": "Archive",
"archiveLocation": "Archive location",
"attachments": [],
"callNumber": "Call number",
"citationKey": "Citation key",
"collections": [],
"committee": "Committee",
"creators": [
{
"creatorType": "author",
"firstName": "authorFirst",
"lastName": "authorLast"
},
{
"creatorType": "contributor",
"firstName": "contributorFirst",
"lastName": "contributorLast"
},
{
"creatorType": "author",
"name": "Institutional Author"
}
],
"date": "1999-12-31",
"dateAdded": "2023-03-23T05:19:51Z",
"dateModified": "2023-03-23T05:19:51Z",
"extra": "Extra",
"itemType": "standard",
"language": "en-US",
"libraryCatalog": "Library catalog",
"notes": [],
"numPages": "4",
"number": "3",
"organization": "Authority",
"place": "Place",
"publisher": "Publisher",
"relations": {},
"rights": "Rights",
"shortTitle": "Short title",
"status": "Status",
"tags": [],
"title": "Title",
"type": "Type",
"uri": "http://zotero.org/users/local/35kRWXym/items/B5FEI3EJ",
"url": "http://www.example.com",
"version": 0,
"versionNumber": "Version number"
},
"statute": {
"abstractNote": "Abstract note",
"accessDate": "1997-06-13T23:59:58Z",

180
test/tests/data/translatorExportLegacy.js
View file

@ -489,9 +489,10 @@
"abstractNote": "Abstract note",
"accessDate": "1997-06-13 23:59:58",
"attachments": [],
"authority": "Authority",
"caseName": "Title",
"collections": [],
"court": "Court",
"court": "Authority",
"creators": [
{
"creatorType": "author",
@ -541,7 +542,7 @@
"uniqueFields": {
"abstractNote": "Abstract note",
"accessDate": "1997-06-13 23:59:58",
"court": "Court",
"authority": "Authority",
"date": "1999-12-31",
"extra": "Extra",
"history": "History",
@ -726,6 +727,83 @@
"url": "http://www.example.com",
"volume": "6"
},
"dataset": {
"DOI": "10.1234/example.doi",
"abstractNote": "Abstract note",
"accessDate": "1997-06-13 23:59:58",
"archive": "Archive",
"archiveLocation": "Archive location",
"attachments": [],
"callNumber": "Call number",
"citationKey": "Citation key",
"collections": [],
"creators": [
{
"creatorType": "author",
"firstName": "authorFirst",
"lastName": "authorLast"
},
{
"creatorType": "contributor",
"firstName": "contributorFirst",
"lastName": "contributorLast"
},
{
"creatorType": "author",
"fieldMode": 1,
"lastName": "Institutional Author"
}
],
"date": "1999-12-31",
"dateAdded": "2023-03-23 05:19:50",
"dateModified": "2023-03-23 05:19:50",
"extra": "Extra",
"format": "Medium",
"itemID": 47,
"itemType": "dataset",
"key": "UAXQE9DR",
"language": "en-US",
"libraryCatalog": "Library catalog",
"libraryID": null,
"medium": "Medium",
"notes": [],
"place": "Place",
"publisher": "Publisher",
"relations": {},
"repository": "Publisher",
"repositoryLocation": "Place",
"rights": "Rights",
"seeAlso": [],
"shortTitle": "Short title",
"tags": [],
"title": "Title",
"type": "Type",
"uniqueFields": {
"DOI": "10.1234/example.doi",
"abstractNote": "Abstract note",
"accessDate": "1997-06-13 23:59:58",
"archive": "Archive",
"archiveLocation": "Archive location",
"callNumber": "Call number",
"citationKey": "Citation key",
"date": "1999-12-31",
"extra": "Extra",
"language": "en-US",
"libraryCatalog": "Library catalog",
"medium": "Medium",
"place": "Place",
"publisher": "Publisher",
"rights": "Rights",
"shortTitle": "Short title",
"title": "Title",
"type": "Type",
"url": "http://www.example.com",
"version": "Version number"
},
"uri": "http://zotero.org/users/local/35kRWXym/items/UAXQE9DR",
"url": "http://www.example.com",
"version": "Version number"
},
"dictionaryEntry": {
"ISBN": "978-1-234-56789-7",
"abstractNote": "Abstract note",
@ -1196,6 +1274,7 @@
"abstractNote": "Abstract note",
"accessDate": "1997-06-13 23:59:58",
"attachments": [],
"authority": "Authority",
"collections": [],
"committee": "Committee",
"creators": [
@ -1220,7 +1299,7 @@
"itemType": "hearing",
"key": "ZFDSUNIK",
"language": "en-US",
"legislativeBody": "Legislative body",
"legislativeBody": "Authority",
"libraryID": null,
"notes": [],
"number": "3",
@ -1238,12 +1317,12 @@
"uniqueFields": {
"abstractNote": "Abstract note",
"accessDate": "1997-06-13 23:59:58",
"authority": "Authority",
"committee": "Committee",
"date": "1999-12-31",
"extra": "Extra",
"history": "History",
"language": "en-US",
"legislativeBody": "Legislative body",
"number": "3",
"numberOfVolumes": "7",
"pages": "1-10",
@ -1871,6 +1950,7 @@
"applicationNumber": "Application number",
"assignee": "Assignee",
"attachments": [],
"authority": "Authority",
"collections": [],
"country": "Country",
"creators": [
@ -1901,12 +1981,12 @@
"extra": "Extra",
"filingDate": "2000-01-02",
"issueDate": "1999-12-31",
"issuingAuthority": "Issuing authority",
"issuingAuthority": "Authority",
"itemID": 95,
"itemType": "patent",
"key": "URAE2N3M",
"language": "en-US",
"legalStatus": "Legal status",
"legalStatus": "Status",
"libraryID": null,
"notes": [],
"number": "3",
@ -1919,6 +1999,7 @@
"rights": "Rights",
"seeAlso": [],
"shortTitle": "Short title",
"status": "Status",
"tags": [],
"title": "Title",
"uniqueFields": {
@ -1926,13 +2007,12 @@
"accessDate": "1997-06-13 23:59:58",
"applicationNumber": "Application number",
"assignee": "Assignee",
"authority": "Authority",
"country": "Country",
"date": "1999-12-31",
"extra": "Extra",
"filingDate": "2000-01-02",
"issuingAuthority": "Issuing authority",
"language": "en-US",
"legalStatus": "Legal status",
"number": "3",
"pages": "1-10",
"place": "Place",
@ -1940,6 +2020,7 @@
"references": "References",
"rights": "Rights",
"shortTitle": "Short title",
"status": "Status",
"title": "Title",
"url": "http://www.example.com"
},
@ -2345,6 +2426,89 @@
"uri": "http://zotero.org/users/local/GtG6GoZj/items/2MBIEXX8",
"url": "http://www.example.com"
},
"standard": {
"DOI": "10.1234/example.doi",
"abstractNote": "Abstract note",
"accessDate": "1997-06-13 23:59:58",
"archive": "Archive",
"archiveLocation": "Archive location",
"attachments": [],
"authority": "Authority",
"callNumber": "Call number",
"citationKey": "Citation key",
"collections": [],
"committee": "Committee",
"creators": [
{
"creatorType": "author",
"firstName": "authorFirst",
"lastName": "authorLast"
},
{
"creatorType": "contributor",
"firstName": "contributorFirst",
"lastName": "contributorLast"
},
{
"creatorType": "author",
"fieldMode": 1,
"lastName": "Institutional Author"
}
],
"date": "1999-12-31",
"dateAdded": "2023-03-23 05:19:50",
"dateModified": "2023-03-23 05:19:50",
"extra": "Extra",
"itemID": 69,
"itemType": "standard",
"key": "GLPNQCZH",
"language": "en-US",
"libraryCatalog": "Library catalog",
"libraryID": null,
"notes": [],
"numPages": "4",
"number": "3",
"organization": "Authority",
"place": "Place",
"publisher": "Publisher",
"relations": {},
"rights": "Rights",
"seeAlso": [],
"shortTitle": "Short title",
"status": "Status",
"tags": [],
"title": "Title",
"type": "Type",
"uniqueFields": {
"DOI": "10.1234/example.doi",
"abstractNote": "Abstract note",
"accessDate": "1997-06-13 23:59:58",
"archive": "Archive",
"archiveLocation": "Archive location",
"authority": "Authority",
"callNumber": "Call number",
"citationKey": "Citation key",
"committee": "Committee",
"date": "1999-12-31",
"extra": "Extra",
"language": "en-US",
"libraryCatalog": "Library catalog",
"numPages": "4",
"number": "3",
"place": "Place",
"publisher": "Publisher",
"rights": "Rights",
"shortTitle": "Short title",
"status": "Status",
"title": "Title",
"type": "Type",
"url": "http://www.example.com",
"version": "Version number"
},
"uri": "http://zotero.org/users/local/35kRWXym/items/GLPNQCZH",
"url": "http://www.example.com",
"version": "Version number"
},
"statute": {
"abstractNote": "Abstract note",
"accessDate": "1997-06-13 23:59:58",