commit 4b08734c9a00a62a4928c69fec4d6d228961af65
parent c7e32c7ee6e0159e9a20d7b8e10c1af92c1a201f
Author: Simon Kornblith <simon@simonster.com>
Date: Wed, 22 Jun 2011 07:37:48 +0000
- Z and ZU in sandbox are now shortcuts to Zotero and Zotero.Utilities
- Closes #1654, XPath helper functions
- Fix DOMParser in sandbox under Firefox 5 in a really nasty way (presumably broken by http://hg.mozilla.org/mozilla-central/rev/673f93bb84aa)
- Add XPath-based CrossRef translator
- Fix search translation-related issues (broken since r9471 or r9574)
Diffstat:
3 files changed, 268 insertions(+), 225 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
@@ -280,13 +280,14 @@ Zotero.Translate.Sandbox = {
"wait":function(translate) {},
/**
- * Completes asynchronous detection or translation
+ * Sets the return value for detection
*
* @param {Zotero.Translate} translate
- * @deprecated
*/
"done":function(translate, returnValue) {
- this._returnValue = returnValue;
+ if(translate._currentState === "detect") {
+ translate._returnValue = returnValue;
+ }
},
/**
@@ -588,7 +589,7 @@ Zotero.Translate.Base.prototype = {
*/
"setTranslator":function(translator) {
if(!translator) {
- throw("cannot set translator: invalid value");
+ throw new Error("Zotero.Translate: no translator specified");
}
this.translator = null;
@@ -892,12 +893,9 @@ Zotero.Translate.Base.prototype = {
// Make sure this isn't called twice
if(this._currentState === null) {
- Zotero.debug("Translate: WARNING: Zotero.done() called after translation completion; this should never happen");
- try {
- a
- } catch(e) {
- Zotero.debug(e);
- }
+ var e = new Error();
+ Zotero.debug("Translate: WARNING: Zotero.done() called after translation completion. This should never happen. Please examine the stack below.");
+ Zotero.debug(e.stack);
return;
}
var oldState = this._currentState;
@@ -937,16 +935,18 @@ Zotero.Translate.Base.prototype = {
if(returnValue) {
this._debug("Translation successful");
} else {
- // report error to console
- if(this.translator[0] && this.translator[0].logError) {
- this.translator[0].logError(error.toString(), "exception");
- } else {
- Zotero.logError(error);
+ if(error) {
+ // report error to console
+ if(this.translator[0] && this.translator[0].logError) {
+ this.translator[0].logError(error.toString(), "exception");
+ } else {
+ Zotero.logError(error);
+ }
+
+ // report error to debug log
+ this._debug("Translation using "+(this.translator && this.translator[0] && this.translator[0].label ? this.translator[0].label : "no translator")+" failed: \n"+errorString, 2);
}
- // report error to debug log
- this._debug("Translation using "+(this.translator && this.translator[0] && this.translator[0].label ? this.translator[0].label : "no translator")+" failed: \n"+errorString, 2);
-
this._runHandler("error", error);
}
@@ -967,10 +967,7 @@ Zotero.Translate.Base.prototype = {
return;
}
- if(!this._loadTranslator(this._potentialTranslators[0])) {
- this.complete(false, "Error loading translator into sandbox");
- return;
- }
+ if(!this._loadTranslator(this._potentialTranslators[0])) return;
this._prepareDetection();
this.incrementAsyncProcesses();
@@ -1044,36 +1041,44 @@ Zotero.Translate.Base.prototype = {
"for(var i in createArrays) {"+
"this[createArrays[i]] = [];"+
"}"+
- "};"+
- "Zotero.Collection = function () {};"+
- "Zotero.Collection.prototype.complete = function() { Zotero._collectionDone(this); };"+
- // https://bugzilla.mozilla.org/show_bug.cgi?id=609143 - can't pass E4X to sandbox in Fx4
- "Zotero.getXML = function() {"+
- "var xml = Zotero._getXML();"+
- "if(typeof xml == 'string') return new XML(xml);"+
- "};"+
- "Zotero._transferItem = function(itemString) {"+
- "var item = JSON.parse(itemString);"+
- "item.complete = Zotero.Item.prototype.complete;"+
- "return item;"+
- "};"+
- "Zotero.Item.prototype.complete = function() { ";
+ "};";
+
+ if(this instanceof Zotero.Translate.Export) {
+ src += "Zotero.Collection = function () {};"+
+ "Zotero.Collection.prototype.complete = function() { Zotero._collectionDone(this); };";
+ } else if (this instanceof Zotero.Translate.Import) {
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=609143 - can't pass E4X to sandbox in Fx4
+ src += "Zotero.getXML = function() {"+
+ "var xml = Zotero._getXML();"+
+ "if(typeof xml == 'string') return new XML(xml);"+
+ "};";
+ }
+
if(Zotero.isFx) {
// workaround for inadvertant attempts to pass E4X back from sandbox
- src += "for(var key in this) {"+
- "if("+createArrays+".indexOf(key) !== -1) {"+
- "for each(var item in this[key]) {"+
- "for(var key2 in item[key2]) {"+
- "if(typeof item[key2] === 'xml') {"+
- "item[key2] = item[key2].toString();"+
+ src += "Zotero._transferItem = function(itemString) {"+
+ "var item = JSON.parse(itemString);"+
+ "item.complete = Zotero.Item.prototype.complete;"+
+ "return item;"+
+ "};"+
+ "Zotero.Item.prototype.complete = function() { "+
+ "for(var key in this) {"+
+ "if("+createArrays+".indexOf(key) !== -1) {"+
+ "for each(var item in this[key]) {"+
+ "for(var key2 in item[key2]) {"+
+ "if(typeof item[key2] === 'xml') {"+
+ "item[key2] = item[key2].toString();"+
+ "}"+
"}"+
"}"+
+ "} else if(typeof this[key] === 'xml') {"+
+ "this[key] = this[key].toString();"+
"}"+
- "} else if(typeof this[key] === 'xml') {"+
- "this[key] = this[key].toString();"+
- "}"+
- "}";
+ "}";
+ } else {
+ src += "Zotero.Item.prototype.complete = function() { ";
}
+
src += "Zotero._itemDone(this);"+
"}";
@@ -1081,6 +1086,10 @@ Zotero.Translate.Base.prototype = {
this._sandboxManager.importObject(this.Sandbox, this);
this._sandboxManager.importObject({"Utilities":new Zotero.Utilities.Translate(this)});
this._sandboxManager.sandbox.Zotero.Utilities.HTTP = this._sandboxManager.sandbox.Zotero.Utilities;
+
+ // create shortcuts
+ this._sandboxManager.sandbox.Z = this._sandboxManager.sandbox.Zotero;
+ this._sandboxManager.sandbox.ZU = this._sandboxManager.sandbox.Zotero.Utilities;
},
/**
@@ -1612,16 +1621,16 @@ Zotero.Translate.Search.prototype.setTranslator = function(translator) {
* translation fails
*/
Zotero.Translate.Search.prototype.complete = function(returnValue, error) {
- if(this._currentState == "translate") {
- if(!this.newItems.length) returnValue = false;
- if(!returnValue) {
- Zotero.debug("Translate: Could not find a result using "+this.translator[0].label+": \n"
- +this._generateErrorString(error), 3);
- if(this.translator.length > 1) {
- this.translator.shift();
- this.translate(this._libraryID, this._saveAttachments);
- return;
- }
+ if(this._currentState == "translate" && !this.newItems.length) {
+ Zotero.debug("Translate: Could not find a result using "+this.translator[0].label+": \n"
+ +this._generateErrorString(error), 3);
+ if(this.translator.length > 1) {
+ this.translator.shift();
+ this.translate(this._libraryID, this._saveAttachments);
+ return;
+ } else {
+ error = "No items returned from any translator";
+ returnValue = false;
}
}
diff --git a/chrome/content/zotero/xpcom/translation/translate_firefox.js b/chrome/content/zotero/xpcom/translation/translate_firefox.js
@@ -68,12 +68,62 @@ Zotero.Translate.SandboxManager = function(sandboxLocation) {
// expose parseFromString
this.__exposedProps__ = {"parseFromString":"r"};
- this.parseFromString = function(str, contentType) _DOMParser.parseFromString(str, contentType);
+ if(Zotero.isFx5) {
+ this.parseFromString = function(str, contentType) {
+ return Zotero.Translate.SandboxManager.Fx5DOMWrapper(_DOMParser.parseFromString(str, contentType));
+ }
+ } else {
+ this.parseFromString = function(str, contentType) _DOMParser.parseFromString(str, contentType);
+ }
}
this.sandbox.DOMParser.__exposedProps__ = {"prototype":"r"};
this.sandbox.DOMParser.prototype = {};
}
+/**
+ * A really ugly way of making a DOM object not look like a DOM object, so we can pass it to the
+ * sandbox under Firefox 5
+ */
+Zotero.Translate.SandboxManager.Fx5DOMWrapper = function(obj, parent) {
+ if(obj === null) {
+ return null;
+ }
+
+ var type = typeof obj;
+ if(type === "function") {
+ var me = this;
+ var val = function() {
+ var nArgs = arguments.length;
+ var args = new Array(nArgs);
+ for(var i=0; i<nArgs; i++) {
+ args[i] = (arguments[i] instanceof Object && arguments[i].__wrappedDOMObject
+ ? arguments[i].__wrappedDOMObject : arguments[i]);
+ }
+ return Zotero.Translate.SandboxManager.Fx5DOMWrapper(obj.apply(parent ? parent : null, args));
+ }
+ } else if(type === "object") {
+ if(val instanceof Array) {
+ var val = [];
+ } else {
+ var val = {};
+ }
+ } else {
+ return obj;
+ }
+
+ val.__wrappedDOMObject = obj;
+ val.__exposedProps__ = {};
+ for(var prop in obj) {
+ let localProp = prop;
+ val.__exposedProps__[localProp] = "r";
+ val.__defineGetter__(localProp, function() {
+ return Zotero.Translate.SandboxManager.Fx5DOMWrapper(obj[localProp], obj);
+ });
+ }
+
+ return val;
+}
+
Zotero.Translate.SandboxManager.prototype = {
/**
* Evaluates code in the sandbox
diff --git a/translators/CrossRef.js b/translators/CrossRef.js
@@ -8,10 +8,11 @@
"maxVersion":"",
"priority":90,
"inRepository":true,
- "lastUpdated":"2011-06-10 17:19:11"
+ "lastUpdated":"2011-06-21 02:10:40"
}
/* CrossRef uses unixref; documentation at http://www.crossref.org/schema/documentation/unixref1.0/unixref.html */
+var ns;
function detectSearch(item) {
if(item.itemType == "journalArticle") {
@@ -27,209 +28,192 @@ function fixAuthorCapitalization(string) {
return string;
}
+function parseCreators(node, item, typeOverrideMap) {
+ var contributors = ZU.xpath(node, 'c:contributors/c:organization | c:contributors/c:person_name', ns);
+ for(var i in contributors) {
+ var creatorXML = contributors[i];
+ var creator = {};
+
+ var role = creatorXML.getAttribute("contributor_role");
+ if(typeOverrideMap && typeOverrideMap[role]) {
+ creator.creatorType = typeOverrideMap[role];
+ } else if(role === "author" || role === "editor" || role === "translator") {
+ creator.creatorType = role;
+ } else {
+ creator.creatorType = "contributor";
+ }
+
+ if(creatorXML.nodeName === "organization") {
+ creator.fieldMode = 1;
+ creator.lastName = creatorXML.textContent;
+ } else if(creatorXML.nodeName === "person_name") {
+ creator.firstName = fixAuthorCapitalization(ZU.xpathText(creatorXML, 'c:given_name', ns));
+ creator.lastName = fixAuthorCapitalization(ZU.xpathText(creatorXML, 'c:surname', ns));
+ }
+ item.creators.push(creator);
+ }
+}
+
function processCrossRef(xmlOutput) {
- xmlOutput = xmlOutput.replace(/<\?xml[^>]*\?>/, "");
+ // XPath does not give us the ability to use the same XPaths regardless of whether or not
+ // there is a namespace, so we add an element to make sure that there will always be a
+ // namespace.
+ xmlOutput = '<xml xmlns="http://www.example.com/">'+xmlOutput.replace(/<\?xml[^>]*\?>/, "")+"</xml>";
// parse XML with E4X
try {
- var xml = new XML(xmlOutput);
- if(!xml.doi_record.length()) {
- var xml = new XML(xmlOutput);
- }
+ var parser = new DOMParser();
+ var doc = parser.parseFromString(xmlOutput, "text/xml");
} catch(e) {
+ Zotero.debug(e);
return false;
}
- // "with ({});" needed to fix default namespace scope issue
- // See https://bugzilla.mozilla.org/show_bug.cgi?id=330572
- default xml namespace = "http://www.crossref.org/xschema/1.1"; with ({});
-
- if(!xml.doi_record.length()) {
- // Fall back to older namespace
- default xml namespace = "http://www.crossref.org/xschema/1.0";
- if(!xml.doi_record.length()) {
- default xml namespace = "";
+ // determine appropriate namespace
+ ns = {"c":"http://www.crossref.org/xschema/1.1", "x":"http://www.example.com/"};
+ var doiRecords = ZU.xpath(doc, '/x:xml/c:doi_records/c:doi_record', ns);
+ if(!doiRecords.length) {
+ ns.c = "http://www.crossref.org/xschema/1.0";
+ doiRecords = ZU.xpath(doc, '/x:xml/c:doi_records/c:doi_record', ns);
+ if(!doiRecords.length) {
+ // this means that the original document was un-namespaced
+ ns.c = "http://www.example.com/";
+ doiRecords = ZU.xpath(doc, '/c:xml/c:doi_records/c:doi_record', ns);
+ if(!doiRecords.length) {
+ throw new Error("No records found");
+ return;
+ }
}
}
+
+ var doiRecord = doiRecords[0];
+
// ensure this isn't an error
- if(xml.doi_record.crossref.error.length()) {
- throw xml.doi_record.crossref.error
+ var errorString = ZU.xpathText(doiRecord, 'c:crossref/c:error', ns);
+ if(errorString !== null) {
+ throw errorString;
return false;
}
- if(xml.doi_record[0].crossref.journal.length()) {
- var item = new Zotero.Item("journalArticle");
- var itemXML = xml.doi_record.crossref.journal;
- var refXML = itemXML.journal_article;
- var metadataXML = itemXML.journal_metadata;
-
- item.publicationTitle = itemXML.journal_metadata.full_title.toString();
- if (itemXML.journal_metadata.abbrev_title.length()) {
- item.journalAbbreviation = itemXML.journal_metadata.abbrev_title[0].toString();
- }
- item.volume = itemXML.journal_issue.journal_volume.volume.toString();
- item.issue = itemXML.journal_issue.issue.toString();
- } else if(xml.doi_record[0].crossref["report-paper"].length()) {
- // Report Paper
- // Example: doi: 10.4271/2010-01-0907
- // http://www.crossref.org/openurl/?pid=zter:zter321&url_ver=Z39.88-2004&ctx_ver=Z39.88-2004&rft_id=info%3Adoi/10.4271/2010-01-0907&rft_val_fmt=info%3A
- var itemXML = xml.doi_record[0].crossref["report-paper"];
- var refXML = itemXML["report-paper_metadata"];
- var metadataXML = itemXML["report-paper_metadata"];
- var item = new Zotero.Item("report");
- if (metadataXML.publisher_item.item_number.toString())
- item.reportNumber = metadataXML.publisher_item.item_number.toString();
- item.institution = metadataXML.publisher.publisher_name.toString();
- item.place = metadataXML.publisher.publisher_place.toString();
- } else if(xml.doi_record[0].crossref.book.length()) {
+
+ var itemXML, item, refXML, metadataXML, seriesXML;
+ if((itemXML = ZU.xpath(doiRecord, 'c:crossref/c:journal', ns)).length) {
+ item = new Zotero.Item("journalArticle");
+ refXML = ZU.xpath(itemXML, 'c:journal_article', ns);
+ metadataXML = ZU.xpath(itemXML, 'c:journal_metadata', ns);
+
+ item.publicationTitle = ZU.xpathText(metadataXML, 'c:full_title[1]', ns);
+ item.journalAbbreviation = ZU.xpathText(refXML, 'c:abbrev_title[1]', ns);
+ item.volume = ZU.xpathText(itemXML, 'c:journal_issue/c:journal_volume/c:volume', ns);
+ item.issue = ZU.xpathText(itemXML, 'c:journal_issue/c:journal_volume/c:issue', ns);
+ } else if((itemXML = ZU.xpath(doiRecord, 'c:crossref/c:report-paper', ns)).length) {
+ // Report Paper
+ // Example: doi: 10.4271/2010-01-0907
+ // http://www.crossref.org/openurl/?pid=zter:zter321&url_ver=Z39.88-2004&rft_id=info:doi/10.4271/2010-01-0907&format=unixref&redirect=false
+ item = new Zotero.Item("report");
+ refXML = ZU.xpath(itemXML, 'c:report-paper_metadata', ns);
+ metadataXML = refXML;
+
+ item.reportNumber = ZU.xpathText(refXML, 'c:publisher_item/c:item_number', ns);
+ item.institution = ZU.xpathText(refXML, 'c:publisher/c:publisher_name', ns);
+ item.place = ZU.xpathText(refXML, 'c:publisher/c:publisher_place', ns);
+ } else if((itemXML = ZU.xpath(doiRecord, 'c:crossref/c:book', ns)).length) {
// Book chapter
// Example: doi: 10.1017/CCOL0521858429.016
- if(xml.doi_record[0].crossref.book.@book_type.length()
- && xml.doi_record[0].crossref.book.@book_type == 'edited_book') {
- var item = new Zotero.Item("bookSection");
- var refXML = xml.doi_record[0].crossref.book.content_item;
- if (xml.doi_record[0].crossref.book.book_series_metadata.length())
- var metadataXML = xml.doi_record[0].crossref.book.book_series_metadata;
- else if (xml.doi_record[0].crossref.book.book_metadata.length())
- var metadataXML = xml.doi_record[0].crossref.book.book_metadata;
- if (metadataXML.series_metadata.length())
- item.bookTitle = metadataXML.series_metadata.titles.title[0].toString();
- else if (metadataXML.length())
- item.bookTitle = metadataXML.titles.title[0].toString();
-
- // Handle book authors
- if (metadataXML.contributors.length()) {
- for each (var creatorXML in metadataXML.contributors.children()) {
- var creator = {creatorType:"bookAuthor"};
- if(creatorXML.@contributor_role == "editor") {
- creator.creatorType = "editor";
- } else if(creatorXML.@contributor_role == "translator") {
- creator.creatorType = "translator";
- }
- if(creatorXML.localName() == "organization") {
- creator.fieldMode = 1;
- creator.lastName = creatorXML.toString();
- } else if(creatorXML.localName() == "person_name") {
- creator.firstName = fixAuthorCapitalization(creatorXML.given_name.toString());
- creator.lastName = fixAuthorCapitalization(creatorXML.surname.toString());
- }
- item.creators.push(creator);
- }
- }
+ // http://www.crossref.org/openurl/?pid=zter:zter321&url_ver=Z39.88-2004&rft_id=info:doi/10.1017/CCOL0521858429.016&format=unixref&redirect=false
// Reference book entry
// Example: doi: 10.1002/14651858.CD002966.pub3
- // http://www.crossref.org/openurl/?url_ver=Z39.88-2004&req_dat=usr:pwd&rft_id=info:doi/10.1002/14651858.CD002966.pub3&format=unixref&redirect=false
- } else if(xml.doi_record[0].crossref.book.@book_type.length()
- && (xml.doi_record[0].crossref.book.@book_type == 'reference'
- || xml.doi_record[0].crossref.book.@book_type == 'other')
- && (xml.doi_record[0].crossref.book.content_item.@component_type == "chapter"
- || xml.doi_record[0].crossref.book.content_item.@component_type == 'reference_entry')) {
- var item = new Zotero.Item("bookSection");
- var refXML = xml.doi_record[0].crossref.book.content_item;
- var metadataXML = (xml.doi_record[0].crossref.book.book_metadata.length() ?
- xml.doi_record[0].crossref.book.book_metadata :
- xml.doi_record[0].crossref.book.book_series_metadata);
- item.bookTitle = metadataXML.titles.title[0].toString();
+ // http://www.crossref.org/openurl/?pid=zter:zter321&url_ver=Z39.88-2004&rft_id=info:doi/10.1002/14651858.CD002966.pub3&format=unixref&redirect=false
+ var bookType = itemXML[0].hasAttribute("book_type") ? itemXML[0].getAttribute("book_type") : null;
+ var componentType = itemXML[0].hasAttribute("component_type") ? itemXML[0].getAttribute("component_type") : null;
+
+ var isReference = ["reference", "other"].indexOf(bookType) !== -1
+ && ["chapter", "reference_entry"].indexOf(componentType);
+
+ if(bookType === "edited_book" || isReference) {
+ item = new Zotero.Item("bookSection");
+ refXML = ZU.xpath(itemXML, 'c:content_item', ns);
- // Handle book authors
- if (metadataXML.contributors.length()) {
- for each (var creatorXML in metadataXML.contributors.children()) {
- var creator = {creatorType:"bookAuthor"};
- if(creatorXML.@contributor_role == "editor") {
- creator.creatorType = "editor";
- } else if(creatorXML.@contributor_role == "translator") {
- creator.creatorType = "translator";
- }
- if(creatorXML.localName() == "organization") {
- creator.fieldMode = 1;
- creator.lastName = creatorXML.toString();
- } else if(creatorXML.localName() == "person_name") {
- creator.firstName = fixAuthorCapitalization(creatorXML.given_name.toString());
- creator.lastName = fixAuthorCapitalization(creatorXML.surname.toString());
- }
- item.creators.push(creator);
- }
+ if(isReference) {
+ metadataXML = ZU.xpath(itemXML, 'c:book_metadata', ns);
+ if(!metadataXML.length) metadataXML = ZU.xpath(itemXML, 'c:book_series_metadata', ns);
+
+ item.bookTitle = ZU.xpathText(metadataXML, 'c:titles[1]/c:title[1]', ns);
+ } else {
+ metadataXML = ZU.xpath(itemXML, 'c:book_series_metadata', ns);
+ if(!metadataXML.length) metadataXML = ZU.xpath(itemXML, 'c:book_metadata', ns);
+
+ item.bookTitle = ZU.xpathText(metadataXML, 'c:series_metadata/c:titles[1]/c:title[1]', ns);
+ if(!item.bookTitle) item.bookTitle = ZU.xpathText(metadataXML, 'c:titles[1]/c:title[1]', ns);
}
+
+ // Handle book authors
+ parseCreators(metadataXML, item, {"author":"bookAuthor"});
// Book
} else {
- var item = new Zotero.Item("book");
- var refXML = xml.doi_record[0].crossref.book.book_metadata;
- var metadataXML = refXML;
- var seriesXML = metadataXML.series_metadata;
+ item = new Zotero.Item("book");
+ refXML = ZU.xpath(itemXML, 'c:book_metadata', ns);
+ metadataXML = refXML;
+ seriesXML = ZU.xpath(refXML, 'c:series_metadata', ns);
}
- item.place = metadataXML.publisher.publisher_place.toString();
- } else if(xml.doi_record[0].crossref.conference.length()) {
- var item = new Zotero.Item("conferencePaper");
- var itemXML = xml.doi_record[0].crossref.conference;
- var refXML = itemXML.conference_paper;
- var metadataXML = itemXML.proceedingsMetadata;
- var seriesXML = metadataXML.series_metadata;
+ item.place = ZU.xpathText(metadataXML, 'c:publisher/c:publisher_place', ns);
+ } else if((itemXML = ZU.xpath(doiRecord, 'c:crossref/c:conference', ns)).length) {
+ item = new Zotero.Item("conferencePaper");
+ refXML = ZU.xpath(itemXML, 'c:conference_paper', ns);
+ metadataXML = ZU.xpath(itemXML, 'c:proceedings_metadata', ns);
+ seriesXML = ZU.xpath(metadataXML, 'c:proceedings_metadata', ns);
- item.publicationTitle = itemXML.proceedings_metadata.proceedings_title.toString();
- item.place = itemXML.event_metadata.conference_location.toString();
- item.conferenceName = itemXML.event_metadata.conference_name.toString();
+ item.publicationTitle = ZU.xpathText(metadataXML, 'c:publisher/c:proceedings_title', ns);
+ item.place = ZU.xpathText(metadataXML, 'c:event_metadata/c:conference_location', ns);
+ item.conferenceName = ZU.xpathText(metadataXML, 'c:event_metadata/c:conference_name', ns);
}
- var contributors = refXML.contributors.children();
+ item.ISBN = ZU.xpathText(metadataXML, 'c:isbn', ns);
+ item.ISSN = ZU.xpathText(metadataXML, 'c:issn', ns);
+ item.publisher = ZU.xpathText(metadataXML, 'c:publisher/c:publisher_name', ns);
+ item.edition = ZU.xpathText(metadataXML, 'c:edition_number', ns);
+ if(!item.volume) item.volume = ZU.xpathText(metadataXML, 'c:volume', ns);
- if(metadataXML.isbn.length()) item.ISBN = metadataXML.isbn[0].toString();
- if(metadataXML.issn.length()) item.ISSN = metadataXML.issn[0].toString();
- item.publisher = metadataXML.publisher.publisher_name.toString();
- item.edition = metadataXML.edition_number.toString();
- if(!item.volume) item.volume = metadataXML.volume.toString();
+ parseCreators(refXML, item, "author");
- if(seriesXML && seriesXML.length()) {
- if(seriesXML.contributors.length()) {
- contributors += seriesXML.contributors.children();
- }
- item.seriesNumber = seriesXML.series_number.toString();
+ if(seriesXML && seriesXML.length) {
+ parseCreators(refXML, item, {"editor":"seriesEditor"});
+ item.seriesNumber = ZU.xpathText(seriesXML, 'c:series_number', ns);
}
-
- for each(var creatorXML in contributors) {
- var creator = {creatorType:"author"};
- if(creatorXML.@contributor_role == "editor") {
- creator.creatorType = "editor";
- } else if(creatorXML.@contributor_role == "translator") {
- creator.creatorType = "translator";
- } else if(creatorXML.@contributor_role == "chair") {
- creator.creatorType = "contributor";
- }
+
+ var pubDateNode = ZU.xpath(refXML, 'c:publication_date', ns);
+ if(!pubDateNode) ZU.xpath(metadataXML, 'c:publication_date', ns);
+
+ if(pubDateNode.length) {
+ var year = ZU.xpathText(pubDateNode[0], 'c:year', ns);
+ var month = ZU.xpathText(pubDateNode[0], 'c:month', ns);
+ var day = ZU.xpathText(pubDateNode[0], 'c:day', ns);
- if(creatorXML.localName() == "organization") {
- creator.fieldMode = 1;
- creator.lastName = creatorXML.toString();
- } else if(creatorXML.localName() == "person_name") {
- creator.firstName = fixAuthorCapitalization(creatorXML.given_name.toString());
- creator.lastName = fixAuthorCapitalization(creatorXML.surname.toString());
+ if(year) {
+ if(month) {
+ if(day) {
+ item.date = year+"-"+month+"-"+day;
+ } else {
+ item.date = month+"/"+year
+ }
+ } else {
+ item.date = year;
+ }
}
- item.creators.push(creator);
}
- var pubDateNode;
- if(refXML.publication_date.length()) {
- pubDateNode = refXML.publication_date;
- }
- // For book chapters, try metadataXML node
- else if(metadataXML.publication_date.length()) {
- pubDateNode = metadataXML.publication_date;
- }
- if(pubDateNode) {
- item.date = pubDateNode[0].year.toString();
- if(pubDateNode[0].month.length()) {
- item.date = pubDateNode[0].month.toString()+"/"+item.date;
- }
+ var pages = ZU.xpath(refXML, 'c:pages[1]', ns);
+ if(pages.length) {
+ item.pages = ZU.xpathText(pages, 'c:first_page[1]', ns);
+ var lastPage = ZU.xpathText(pages, 'c:last_page[1]', ns);
+ if(lastPage) item.pages += "-"+lastPage;
}
- if(refXML.pages.length()) {
- item.pages = refXML.pages.first_page.toString();
- if(refXML.pages.last_page.length()) {
- item.pages += "-"+refXML.pages.last_page.toString();
- }
- }
+ item.DOI = ZU.xpathText(refXML, 'c:doi_data/c:doi', ns);
+ item.url = ZU.xpathText(refXML, 'c:doi_data/c:resource', ns);
+ item.title = ZU.xpathText(refXML, 'c:titles[1]/c:title[1]', ns);
- item.DOI = refXML.doi_data.doi.toString();
- item.url = refXML.doi_data.resource.toString();
- item.title = refXML.titles[0].title.toString().replace(/^<title>/, "").replace(/<\/title>$/,"");
+ Zotero.debug(item);
item.complete();
return true;
