From 645ce6d6238e036104e4746e388a2948eaafc956 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Tue, 22 Oct 2013 01:26:56 -0400
Subject: [PATCH] Tweaks to #384

- Prefer btitle to title for OpenURL 1.0
- Remove unnecessary institution mapping (base-field mapped to publisher)
- Formatting fixes
---
 chrome/content/zotero/xpcom/openurl.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/chrome/content/zotero/xpcom/openurl.js b/chrome/content/zotero/xpcom/openurl.js
index 864ba8ae11..7291b940c0 100644
--- a/chrome/content/zotero/xpcom/openurl.js
+++ b/chrome/content/zotero/xpcom/openurl.js
@@ -154,10 +154,9 @@ Zotero.OpenURL = new function() {
 				if(item.title) _mapTag(item.title, "atitle")		
 				if(item.proceedingsTitle) _mapTag(item.proceedingsTitle, (version == "0.1" ? "title" : "btitle"));
 			} else if (item.itemType == "report") {
-			    _mapTag("report", "genre");
-			    if(item.seriesTitle) _mapTag(item.seriesTitle, "series");
-			    if(item.institution) _mapTag(item.institution, "publisher");
-			    if(item.title) _mapTag(item.title, "title")
+				_mapTag("report", "genre");
+				if(item.seriesTitle) _mapTag(item.seriesTitle, "series");
+				if(item.title) _mapTag(item.title, (version == "0.1" ? "title" : "btitle"));
 			} else {
 				_mapTag("bookitem", "genre");
 				if(item.title) _mapTag(item.title, "atitle")		
@@ -401,9 +400,11 @@ Zotero.OpenURL = new function() {
 			} else if(key == "rft.edition") {
 				item.edition = value;
 			} else if(key == "rft.series") {
-			    if(item.itemType == "report"){
-				item.seriesTitle = value;
-			    } else item.series = value;
+				if(item.itemType == "report") {
+					item.seriesTitle = value;
+				} else {
+					item.series = value;
+				}
 			} else if(item.itemType == "thesis") {
 				if(key == "rft.inst") {
 					item.publisher = value;