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

Fix handling of item types and accesDate in ZU.itemFromCSLJSON()

Browse source
This commit is contained in:
Simon Kornblith 2012-06-15 15:54:27 -04:00
parent a48a60a230
commit 69f273a60e
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
chrome/content/zotero/xpcom/utilities.js
View file

@ -1399,7 +1399,7 @@ Zotero.Utilities = {
var isZoteroItem = item instanceof Zotero.Item, zoteroType; var isZoteroItem = item instanceof Zotero.Item, zoteroType;
for(var type in CSL_TYPE_MAPPINGS) { for(var type in CSL_TYPE_MAPPINGS) {
if(CSL_TYPE_MAPPINGS[zoteroType] == item.type) { if(CSL_TYPE_MAPPINGS[type] == cslItem.type) {
zoteroType = type; zoteroType = type;
break; break;
} }
@ -1484,11 +1484,28 @@ Zotero.Utilities = {
if(Zotero.ItemFields.isValidForType(fieldID, itemTypeID)) { if(Zotero.ItemFields.isValidForType(fieldID, itemTypeID)) {
var date = ""; var date = "";
if(cslDate.literal) { if(cslDate.literal) {
date = cslDate.literal; if(variable === "accessed") {
date = strToISO(cslDate.literal);
} else {
date = cslDate.literal;
}
} else if(cslDate.year) { } else if(cslDate.year) {
if(cslDate.month) cslDate.month--; if(variable === "accessed") {
date = Zotero.Date.formatDate(cslDate); // Need to convert to SQL
if(cslDate.season) date = cslDate.season+date; var date = Zotero.Utilities.lpad(cslDate.year, "0", 4);
if(cslDate.month) {
date += "-"+Zotero.Utilities.lpad(cslDate.month+1, "0", 2);
if(cslDate.day) {
date += "-"+Zotero.Utilities.lpad(cslDate.day, "0", 2);
}
}
} else {
if(cslDate.month) cslDate.month--;
date = Zotero.Date.formatDate(cslDate);
if(cslDate.season) {
date = date+" "+cslDate.season;
}
}
} }
if(isZoteroItem) { if(isZoteroItem) {