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

- makes proxy detection work with domain-based EZProxies (I think)

Browse Source 
- fixes Word Integration bugs
This commit is contained in:
Simon Kornblith 2006-09-14 02:51:45 +00:00
parent fe319f033b
commit 0f8c3e7669
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Zotero.dot
View File

Binary file not shown.

BIN
Zotero.dot.dmg
View File

Binary file not shown.

6
chrome/chromeFiles/content/scholar/xpcom/ingester.js
View File

@ -58,7 +58,9 @@ Scholar.Ingester.ProxyMonitor = new function() {
} }
} }
} }
} catch(e) {}
try {
// find ezproxies // find ezproxies
if(channel.getResponseHeader("Server") == "EZproxy") { if(channel.getResponseHeader("Server") == "EZproxy") {
// We're connected to an EZproxy // We're connected to an EZproxy
@ -93,7 +95,9 @@ Scholar.Ingester.ProxyMonitor = new function() {
return; return;
} }
if(channel.URI.host == newURI.host && channel.URI.port != newURI.port) { if((channel.URI.host == newURI.host && channel.URI.port != newURI.port) ||
(newURI.host != channel.URI.host &&
newURI.hostPort.substr(newURI.hostPort.length-channel.URI.hostPort.length) == channel.URI.hostPort)) {
// Different ports but the same server means EZproxy active // Different ports but the same server means EZproxy active
Scholar.debug("EZProxy: host "+newURI.hostPort+" is really "+properURI.hostPort); Scholar.debug("EZProxy: host "+newURI.hostPort+" is really "+properURI.hostPort);

11
chrome/chromeFiles/content/scholar/xpcom/integration.js
View File

@ -531,8 +531,11 @@ Scholar.Integration.SOAP = new function() {
} }
Scholar.Integration.Session = function(styleID) { Scholar.Integration.Session = function(styleID) {
this.styleID = styleID; if(styleID) {
this.style = Scholar.Cite.getStyle(this.styleID); this.styleID = styleID;
this.style = Scholar.Cite.getStyle(this.styleID);
}
this.citationSet = new Scholar.Integration.CitationSet(this.style); this.citationSet = new Scholar.Integration.CitationSet(this.style);
this.citationFactory = new Scholar.Integration.CitationFactory(this.style); this.citationFactory = new Scholar.Integration.CitationFactory(this.style);
} }
@ -616,7 +619,7 @@ Scholar.Integration.CitationSet = function(style) {
this.citationsByIndex = new Object(); this.citationsByIndex = new Object();
this.lastItemID = null; this.lastItemID = null;
this.style = style; if(style) this.style = style;
} }
/* /*
@ -669,7 +672,7 @@ Scholar.Integration.CitationSet.prototype.addCitation = function(citation) {
* a class to generate and cache citations * a class to generate and cache citations
*/ */
Scholar.Integration.CitationFactory = function(style) { Scholar.Integration.CitationFactory = function(style) {
this.style = style; if(style) this.style = style;
this.cache = new Object(); this.cache = new Object();
this.dateModified = new Object(); this.dateModified = new Object();
this.items = new Array(); this.items = new Array();