From 934d8ef2b1278c6f5dd01f14fd3569949f9e83a6 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Wed, 19 Sep 2007 07:15:36 +0000 Subject: [PATCH] - closes #752, JHU library catalog (Dynix) broken - commits changes to editBibliographyDialog (forgotten in last commit) --- chrome/content/zotero/editBibliographyDialog.xul | 2 +- scrapers.sql | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chrome/content/zotero/editBibliographyDialog.xul b/chrome/content/zotero/editBibliographyDialog.xul index 87f7b01f7..dd7eba7a3 100644 --- a/chrome/content/zotero/editBibliographyDialog.xul +++ b/chrome/content/zotero/editBibliographyDialog.xul @@ -34,7 +34,7 @@ onload="Zotero_Bibliography_Dialog.load();" onunload="doUnload();" ondialogaccept="Zotero_Bibliography_Dialog.accept();" - buttons="cancel,accept" + buttons="accept" xmlns:html="http://www.w3.org/1999/xhtml" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" style="padding: 0"> diff --git a/scrapers.sql b/scrapers.sql index 62410a170..b3d46b8b1 100644 --- a/scrapers.sql +++ b/scrapers.sql @@ -6534,9 +6534,9 @@ REPLACE INTO translators VALUES ('cf87eca8-041d-b954-795a-2d86348999d5', '1.0.0b Zotero.wait(); }'); -REPLACE INTO translators VALUES ('774d7dc2-3474-2684-392c-f787789ec63d', '1.0.0b3.r1', '', '2007-08-15 16:00:00', '1', '100', '4', 'Library Catalog (Dynix)', 'Simon Kornblith', 'ipac\.jsp\?.*(?:uri=full=[0-9]|menu=search)', +REPLACE INTO translators VALUES ('774d7dc2-3474-2684-392c-f787789ec63d', '1.0.0b3.r1', '', '2007-09-19 07:13:03', '1', '100', '4', 'Library Catalog (Dynix)', 'Simon Kornblith', 'ipac\.jsp\?.*(?:uri=(?:link|full)=[0-9]|menu=search)', 'function detectWeb(doc, url) { - var detailsRe = new RegExp(''ipac\.jsp\?.*uri=full=[0-9]''); + var detailsRe = new RegExp(''ipac\.jsp\?.*uri=(?:full|link)=[0-9]''); if(detailsRe.test(doc.location.href)) { return "book"; } else { @@ -6550,13 +6550,13 @@ REPLACE INTO translators VALUES ('774d7dc2-3474-2684-392c-f787789ec63d', '1.0.0b } : null; var uri = doc.location.href; - var detailsRe = new RegExp(''ipac\.jsp\?.*uri=full=[0-9]''); + var detailsRe = new RegExp(''ipac\.jsp\?.*uri=(?:full|link)=[0-9]''); var uris = new Array(); if(detailsRe.test(uri)) { uris.push(uri+''&fullmarc=true''); } else { - var items = Zotero.Utilities.getItemArray(doc, doc, "ipac\.jsp\?.*uri=full=[0-9]|^javascript:buildNewList\\(''.*uri%3Dfull%3D[0-9]"); + var items = Zotero.Utilities.getItemArray(doc, doc, "ipac\.jsp\?.*uri=(?:full|link)=[0-9]|^javascript:buildNewList\\(''.*uri%3Dfull%3D[0-9]"); items = Zotero.selectItems(items); if(!items) {