From dfff5ae2db1ea6b46d278e5d4ff7792a90a365e5 Mon Sep 17 00:00:00 2001 From: Dolf Andringa Date: Sun, 10 May 2015 17:52:37 +0800 Subject: [PATCH 1/4] Fixes for issues #174 and #175 --- modules/CiteProc/biblio_citeproc.admin.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/CiteProc/biblio_citeproc.admin.inc b/modules/CiteProc/biblio_citeproc.admin.inc index 277592bd..75c30da0 100644 --- a/modules/CiteProc/biblio_citeproc.admin.inc +++ b/modules/CiteProc/biblio_citeproc.admin.inc @@ -344,14 +344,19 @@ function _install_csl($name = NULL, $csl = NULL, $sha = NULL, $all = FALSE, $upd } } else { - drupal_set_message(t('I could not parse the CSL provided as valid XML', 'error')); + drupal_set_message(t('I could not parse the CSL provided as valid XML'), 'error'); } } function _get_zip_from_github() { $zip_url = 'https://github.com/citation-style-language/styles/zipball/master'; $destination = file_build_uri('Biblio-CiteProc-Styles.zip'); + drupal_set_message(t('Destination: @destination',array('@destination' => $destination)), 'status'); $zip_file = system_retrieve_file($zip_url, $destination, TRUE, FILE_EXISTS_REPLACE); + if ($zip_file === FALSE){ + drupal_set_message(t('Failed to fetch zipfile at @zipfile',array('@zipfile' => $zip_url)), 'error'); + return; + } $usage = file_usage_list($zip_file); if (empty($usage)) { file_usage_add($zip_file, 'biblio_citeproc', 'csl', 0); From e1f76d10036268c7317f8a39b2cd308ddaaf75d2 Mon Sep 17 00:00:00 2001 From: Dolf Andringa Date: Sun, 10 May 2015 18:16:07 +0800 Subject: [PATCH 2/4] Remove debug message --- modules/CiteProc/biblio_citeproc.admin.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/CiteProc/biblio_citeproc.admin.inc b/modules/CiteProc/biblio_citeproc.admin.inc index 75c30da0..237de19b 100644 --- a/modules/CiteProc/biblio_citeproc.admin.inc +++ b/modules/CiteProc/biblio_citeproc.admin.inc @@ -351,7 +351,6 @@ function _install_csl($name = NULL, $csl = NULL, $sha = NULL, $all = FALSE, $upd function _get_zip_from_github() { $zip_url = 'https://github.com/citation-style-language/styles/zipball/master'; $destination = file_build_uri('Biblio-CiteProc-Styles.zip'); - drupal_set_message(t('Destination: @destination',array('@destination' => $destination)), 'status'); $zip_file = system_retrieve_file($zip_url, $destination, TRUE, FILE_EXISTS_REPLACE); if ($zip_file === FALSE){ drupal_set_message(t('Failed to fetch zipfile at @zipfile',array('@zipfile' => $zip_url)), 'error'); From ea339bbd541fa7a1ea7b0dd9eddb1147b010e4cb Mon Sep 17 00:00:00 2001 From: Dolf Andringa Date: Mon, 11 May 2015 11:46:00 +0800 Subject: [PATCH 3/4] Resolve issue (drupal.org) #2075227 --- biblio.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/biblio.module b/biblio.module index ce7610bf..0c84ae3c 100644 --- a/biblio.module +++ b/biblio.module @@ -1896,7 +1896,7 @@ function _biblio_citekey_print($citekey) { $style = biblio_get_style(); $base = variable_get('biblio_base', 'biblio'); $node = node_load($nid->nid); - return theme('biblio_style', array('node' => $node, 'base' => $base, 'style' => $style)); + return theme('biblio_style', array('node' => $node, 'base' => $base, 'style_name' => $style)); } else { return t("Citekey @cite not found", array('@cite' => $citekey)); @@ -2254,4 +2254,4 @@ function biblio_ctools_plugin_api() { if ($module == "feeds" && $api == "feeds_importer_default") { return array("version" => 1); } -} \ No newline at end of file +} From 6f13473c9b17e5165cd5111a0e6064285bc38f46 Mon Sep 17 00:00:00 2001 From: Dolf Andringa Date: Wed, 10 Jun 2015 08:33:11 +0800 Subject: [PATCH 4/4] Fixed issue 2168853 --- biblio.info | 2 +- modules/crossref/biblio.crossref.client.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/biblio.info b/biblio.info index e61d906c..64a7570b 100644 --- a/biblio.info +++ b/biblio.info @@ -32,7 +32,7 @@ files[] = views/biblio_handler_sort_contributor_lastname.inc files[] = views/biblio_handler_argument_many_to_one.inc files[] = views/biblio_handler_field_export_link.inc ; Information added by drupal.org packaging script on 2013-05-31 -version = "7.x-1.0-rc5+37-dev" +version = "7.x-1.0-rc7" core = "7.x" project = "biblio" datestamp = "1370023530" diff --git a/modules/crossref/biblio.crossref.client.php b/modules/crossref/biblio.crossref.client.php index e53072f6..ed1506c7 100644 --- a/modules/crossref/biblio.crossref.client.php +++ b/modules/crossref/biblio.crossref.client.php @@ -55,7 +55,7 @@ public function getQuery() { public function fetch() { $this->query = $this->url . '?pid=' . $this->pid . '&noredirect=true&format=unixref&id=doi%3A' . $this->doi; - $request_options = array('method' => 'POST'); + $request_options = array('method' => 'GET'); $result = drupal_http_request($this->query, $request_options); if ($result->code != 200) { @@ -323,4 +323,4 @@ function _unixref_get_contributor_category($role) { if ($role == 'translator') return 4; return NULL; } -} \ No newline at end of file +}