www

commit c457139573845917b1ad9a337d56ea1291299e79
parent 9796e60617aa5b2f100b6adf149e7c0508a22750
Author: Simon Kornblith <simon@simonster.com>
Date:   Sun, 17 Mar 2013 13:05:14 -0700

Merge pull request #270 from aurimasv/RDFimport

Fix RDF import for large notes
Diffstat:
M
chrome/content/zotero/xpcom/data/item.js
 | 
2
+-
M
chrome/content/zotero/xpcom/rdf/init.js
 | 
3
++-
M
chrome/content/zotero/xpcom/translation/translate.js
 | 
2
++

3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
@@ -590,7 +590,7 @@ Zotero.Item.prototype.setType = function(itemTypeID, loadIn) {
 	if (loadIn) {
 		this._itemDataLoaded = false;
 	}
-	else {
+	else if(oldItemTypeID) {
 		this._markFieldChange('itemType', Zotero.ItemTypes.getName(oldItemTypeID));
 		if (!this._changedPrimaryData) {
 			this._changedPrimaryData = {};
diff --git a/chrome/content/zotero/xpcom/rdf/init.js b/chrome/content/zotero/xpcom/rdf/init.js
@@ -19,7 +19,8 @@ var $rdf = {
 	},
 	log: {
 		debug: Zotero.debug,
-		warn: Zotero.debug
+		warn: Zotero.debug,
+		error: Zotero.debug
 	}
 };
 
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
@@ -2258,6 +2258,8 @@ Zotero.Translate.IO = {
 			throw "DOMParser error: loading data into data store failed";
 		}
 		
+		nodes.normalize();
+		
 		return nodes;
 	},