suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closes #1048, Convert all values to strings in serialize()

Browse Source
This commit is contained in:
Dan Stillman 2008-06-25 01:11:22 +00:00
parent 3d725141b6
commit d61914f8c7
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
chrome/content/zotero/xpcom/data/creators.js
View File

@ -306,7 +306,23 @@ Zotero.Creators = new function() {
};
for (var field in fields) {
if (fields[field]) {
cleanedFields[field] = fields[field];
switch (field) {
// Strings
case 'firstName':
case 'lastName':
case 'shortName':
cleanedFields[field] = fields[field] + '';
break;
// Integer
case 'fieldMode':
cleanedFields[field] = fields[field] ? fields[field] : 0;
break;
// Null if empty
default:
cleanedFields[field] = fields[field] ? fields[field] : null;
}
}
}
return cleanedFields;

22
chrome/content/zotero/xpcom/data/item.js
View File

@ -1983,8 +1983,8 @@ Zotero.Item.prototype.getNote = function() {
return '';
}
var sql = "SELECT note FROM itemNotes WHERE itemID=" + this.id;
var note = Zotero.DB.valueQuery(sql);
var sql = "SELECT note FROM itemNotes WHERE itemID=?";
var note = Zotero.DB.valueQuery(sql, this.id);
this._noteText = note ? note : '';
@ -3167,7 +3167,7 @@ Zotero.Item.prototype.toArray = function (mode) {
switch (i) {
case 'itemTypeID':
arr.itemType = Zotero.ItemTypes.getName(this.itemTypeID);
break;
continue;
// Skip virtual fields
case 'firstCreator':
@ -3183,14 +3183,14 @@ Zotero.Item.prototype.toArray = function (mode) {
// Item metadata
for (var i in this._itemData) {
arr[Zotero.ItemFields.getName(i)] = this._itemData[i] ? this._itemData[i] : '';
arr[Zotero.ItemFields.getName(i)] = this._itemData[i] ? this._itemData[i] + '': '';
}
if (mode == 1 || mode == 2) {
if (!arr.title &&
(this.itemTypeID == Zotero.ItemTypes.getID('letter') ||
this.itemTypeID == Zotero.ItemTypes.getID('interview'))) {
arr.title = this.getDisplayTitle(mode == 2);
arr.title = this.getDisplayTitle(mode == 2) + '';
}
}
@ -3289,15 +3289,17 @@ Zotero.Item.prototype.serialize = function(mode) {
arr.virtual = {};
arr.fields = {};
// Primary fields
// Primary and virtual fields
for (var i in Zotero.Item.primaryFields) {
switch (i) {
case 'itemTypeID':
arr.primary.itemType = Zotero.ItemTypes.getName(this.itemTypeID);
break;
continue;
// Skip virtual fields
case 'firstCreator':
arr.virtual[i] = this['_' + i] + '';
continue;
case 'numNotes':
case 'numAttachments':
arr.virtual[i] = this['_' + i];
@ -3311,14 +3313,14 @@ Zotero.Item.prototype.serialize = function(mode) {
// Item metadata
for (var i in this._itemData) {
arr.fields[Zotero.ItemFields.getName(i)] = this._itemData[i] ? this._itemData[i] : '';
arr.fields[Zotero.ItemFields.getName(i)] = this._itemData[i] ? this._itemData[i] + '' : '';
}
if (mode == 1 || mode == 2) {
if (!arr.fields.title &&
(this.itemTypeID == Zotero.ItemTypes.getID('letter') ||
this.itemTypeID == Zotero.ItemTypes.getID('interview'))) {
arr.fields.title = this.getDisplayTitle(mode == 2);
arr.fields.title = this.getDisplayTitle(mode == 2) + '';
}
}