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

- Fix "script stack space quota is exhausted" error with extremely large notes

Browse source 
- Fix repeated text-to-HTML conversion of unedited plaintext notes (which might exist at this point only from direct DB writes)
This commit is contained in:
Dan Stillman 2010-01-05 08:51:44 +00:00
parent 7ae7cc3579
commit 646c35648f
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
chrome/content/zotero/xpcom/data/item.js
View file

@ -1359,7 +1359,8 @@ Zotero.Item.prototype.save = function() {
var parent = this.isNote() ? this.getSource() : null; var parent = this.isNote() ? this.getSource() : null;
var noteText = this._noteText ? this._noteText : ''; var noteText = this._noteText ? this._noteText : '';
// Add <div> wrapper if not present // Add <div> wrapper if not present
if (!noteText.match(/^<div class="zotero-note znv[0-9]+">[\s\S]*<\/div>$/)) { if (!noteText.substr(0, 36).match(/^<div class="zotero-note znv[0-9]+">/)) {
// Keep consistent with getNote()
noteText = '<div class="zotero-note znv1">' + noteText + '</div>'; noteText = '<div class="zotero-note znv1">' + noteText + '</div>';
} }
@ -2307,20 +2308,22 @@ Zotero.Item.prototype.getNote = function() {
// Convert non-HTML notes on-the-fly // Convert non-HTML notes on-the-fly
if (note) { if (note) {
if (!note.match(/^<div class="zotero-note znv[0-9]+">[\s\S]*<\/div>$/)) { if (!note.substr(0, 36).match(/^<div class="zotero-note znv[0-9]+">/)) {
note = Zotero.Utilities.prototype.htmlSpecialChars(note); note = Zotero.Utilities.prototype.htmlSpecialChars(note);
note = '<p>' note = '<div class="zotero-note znv1"><p>'
+ note.replace(/\n/g, '</p><p>') + note.replace(/\n/g, '</p><p>')
.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;') .replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;')
.replace(/ /g, '&nbsp;&nbsp;') .replace(/ /g, '&nbsp;&nbsp;')
+ '</p>'; + '</p></div>';
note = note.replace(/<p>\s*<\/p>/g, '<p>&nbsp;</p>'); note = note.replace(/<p>\s*<\/p>/g, '<p>&nbsp;</p>');
var sql = "UPDATE itemNotes SET note=? WHERE itemID=?"; var sql = "UPDATE itemNotes SET note=? WHERE itemID=?";
Zotero.DB.query(sql, [note, this.id]); Zotero.DB.query(sql, [note, this.id]);
} }
// Don't include <div> wrapper when returning value // Don't include <div> wrapper when returning value
note = note.replace(/^<div class="zotero-note znv[0-9]+">([\s\S]*)<\/div>$/, '$1'); var startLen = note.substr(0, 36).match(/^<div class="zotero-note znv[0-9]+">/)[0].length;
var endLen = 6; // "</div>".length
note = note.substr(startLen, note.length - endLen);
} }
this._noteText = note ? note : ''; this._noteText = note ? note : '';