From 7b40ae2a469717762c3c6dedc52aef066624348d Mon Sep 17 00:00:00 2001 From: Florian Martin-Bariteau Date: Sun, 18 May 2014 18:57:28 -0400 Subject: [PATCH 01/60] Update utilities.js --- chrome/content/zotero/xpcom/utilities.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js index dfe0cd6c8..bff54165a 100644 --- a/chrome/content/zotero/xpcom/utilities.js +++ b/chrome/content/zotero/xpcom/utilities.js @@ -54,9 +54,9 @@ const CSL_TEXT_MAPPINGS = { "collection-number":["seriesNumber"], "publisher":["publisher", "distributor"], /* distributor should move to SQL mapping tables */ "publisher-place":["place"], - "authority":["court"], + "authority":["court","legislativeBody", "issuingAuthority"], "page":["pages"], - "volume":["volume"], + "volume":["volume", "codeNumber"], "issue":["issue"], "number-of-volumes":["numberOfVolumes"], "number-of-pages":["numPages"], @@ -80,7 +80,8 @@ const CSL_TEXT_MAPPINGS = { "call-number":["callNumber"], "note":["extra"], "number":["number"], - "references":["history"], + "chapter-number":["session"], + "references":["history", "references"], "shortTitle":["shortTitle"], "journalAbbreviation":["journalAbbreviation"], "language":["language"] From 982dbeb9624332211b3548bc25aa6b40b613826d Mon Sep 17 00:00:00 2001 From: Florian Martin-Bariteau Date: Thu, 22 May 2014 23:37:17 -0400 Subject: [PATCH 02/60] Update utilities.js --- chrome/content/zotero/xpcom/utilities.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js index bff54165a..f12867481 100644 --- a/chrome/content/zotero/xpcom/utilities.js +++ b/chrome/content/zotero/xpcom/utilities.js @@ -57,13 +57,13 @@ const CSL_TEXT_MAPPINGS = { "authority":["court","legislativeBody", "issuingAuthority"], "page":["pages"], "volume":["volume", "codeNumber"], - "issue":["issue"], + "issue":["issue", "priorityNumbers"], "number-of-volumes":["numberOfVolumes"], "number-of-pages":["numPages"], "edition":["edition"], "version":["version"], - "section":["section"], - "genre":["type"], + "section":["section", "committee"], + "genre":["type", "programmingLanguage"], "source":["libraryCatalog"], "dimensions": ["artworkSize", "runningTime"], "medium":["medium", "system"], @@ -77,13 +77,14 @@ const CSL_TEXT_MAPPINGS = { "DOI":["DOI"], "ISBN":["ISBN"], "ISSN":["ISSN"], - "call-number":["callNumber"], + "call-number":["callNumber", "applicationNumber"], "note":["extra"], "number":["number"], "chapter-number":["session"], "references":["history", "references"], "shortTitle":["shortTitle"], "journalAbbreviation":["journalAbbreviation"], + "status":["legalStatus"], "language":["language"] } @@ -92,7 +93,8 @@ const CSL_TEXT_MAPPINGS = { */ const CSL_DATE_MAPPINGS = { "issued":"date", - "accessed":"accessDate" + "accessed":"accessDate", + "submitted":"filingDate" } /* From 95bf52baf5d8afd6c44b0dd96033edd42b9f4195 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 23 May 2014 14:51:21 -0400 Subject: [PATCH 03/60] Check for NS_ERROR_STORAGE_CONSTRAINT in tag constraint error --- chrome/content/zotero/xpcom/data/tag.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/data/tag.js b/chrome/content/zotero/xpcom/data/tag.js index 5d3556f5a..f7a1a0914 100644 --- a/chrome/content/zotero/xpcom/data/tag.js +++ b/chrome/content/zotero/xpcom/data/tag.js @@ -359,7 +359,9 @@ Zotero.Tag.prototype.save = function (full) { catch (e) { // If an incoming tag is the same as an existing tag, but with a different key, // then delete the old tag and add its linked items to the new tag - if (typeof e == 'string' && e.indexOf('columns libraryID, name, type are not unique') != -1) { + if (typeof e == 'string' && + (e.indexOf('columns libraryID, name, type are not unique') != -1 + || e.indexOf('NS_ERROR_STORAGE_CONSTRAINT') != -1)) { Zotero.debug("Tag matches existing tag with different key -- delete old tag and merging items"); // GET existing tag From 072ae245d975fdd1c25e30dd48a98227f64f761b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 26 May 2014 19:13:21 -0400 Subject: [PATCH 04/60] Use base-mapped dates for sorting (broken in dd477e15) --- chrome/content/zotero/xpcom/itemTreeView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js index ceb4e7d16..23e1ac159 100644 --- a/chrome/content/zotero/xpcom/itemTreeView.js +++ b/chrome/content/zotero/xpcom/itemTreeView.js @@ -1370,7 +1370,7 @@ Zotero.ItemTreeView.prototype.sort = function(itemID) // Use unformatted part of date strings (YYYY-MM-DD) for sorting case 'date': - var val = row.ref.getField('date', true); + var val = row.ref.getField('date', true, true); if (val) { val = val.substr(0, 10); if (val.indexOf('0000') == 0) { @@ -1380,7 +1380,7 @@ Zotero.ItemTreeView.prototype.sort = function(itemID) return val; case 'year': - var val = row.ref.getField('date', true); + var val = row.ref.getField('date', true, true); if (val) { val = val.substr(0, 4); if (val == '0000') { From 59f534d56fb4a00acc1d832dce3fab1c151faaff Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 26 May 2014 20:07:41 -0400 Subject: [PATCH 05/60] Error report improvements - Always allow "Report Errors...", even when no errors - Show submitted diagnostic info in report - Use white background and unitalicized text for report - Make window larger by default --- chrome/content/zotero/errorReport.xul | 90 ++++++++++++-------- chrome/content/zotero/xpcom/schema.js | 2 +- chrome/content/zotero/zoteroPane.js | 5 +- chrome/content/zotero/zoteroPane.xul | 2 +- chrome/locale/en-US/zotero/zotero.dtd | 2 +- chrome/locale/en-US/zotero/zotero.properties | 5 +- chrome/skin/default/zotero/errorReport.css | 8 +- 7 files changed, 69 insertions(+), 45 deletions(-) diff --git a/chrome/content/zotero/errorReport.xul b/chrome/content/zotero/errorReport.xul index eff8c9196..82e65158f 100644 --- a/chrome/content/zotero/errorReport.xul +++ b/chrome/content/zotero/errorReport.xul @@ -6,7 +6,8 @@ + id="zotero-error-report" title="&zotero.errorReport.title;" + width="550" height="450">