Browse Source

Merge branch 'master' of github.com:Islandora/islandora

pull/2/head^2
mroy 14 years ago
parent
commit
436fea28c2
  1. 6
      ilives/book.inc
  2. 2
      ilives/fedora_ilives.module

6
ilives/book.inc

@ -43,8 +43,9 @@ class IslandoraBook {
'path' => 'fedora/ilives/retrieve_unapi/js', // path we defined in hook_menu 'path' => 'fedora/ilives/retrieve_unapi/js', // path we defined in hook_menu
'wrapper' => 'mods-wrapper', // the HTML that wraps the element that needs to be replaced 'wrapper' => 'mods-wrapper', // the HTML that wraps the element that needs to be replaced
'method' => 'replace', // the method we're going to use: a replace operation 'method' => 'replace', // the method we're going to use: a replace operation
'effect' => 'fade', // the effect used when replacing the element (try fade!) //'effect' => 'fade', // the effect used when replacing the element (try fade!)
) ),
'#suffix' => '<br/>',
); );
drupal_add_js('', 'inline'); drupal_add_js('', 'inline');
// We define a <div> wrapper. Everything in it will be replaced. // We define a <div> wrapper. Everything in it will be replaced.
@ -56,6 +57,7 @@ class IslandoraBook {
$form['mods']['mods_record'] = array( $form['mods']['mods_record'] = array(
'#type' => 'textarea', '#type' => 'textarea',
'#title' => 'MODS Record to Import', '#title' => 'MODS Record to Import',
'#rows' => 20,
'#value' => (!empty($mods_save) ? $mods_save['mods']['mods_record'] : ''), '#value' => (!empty($mods_save) ? $mods_save['mods']['mods_record'] : ''),
); );
return $form; return $form;

2
ilives/fedora_ilives.module

@ -430,7 +430,7 @@ function retrieve_unapi_MODS_record($url) {
$bib_response = drupal_http_request($url); $bib_response = drupal_http_request($url);
$bib_html = $bib_response->data; $bib_html = $bib_response->data;
$bib_doc = new DOMDocument; $bib_doc = new DOMDocument;
$bib_doc->loadHTML($bib_html); @$bib_doc->loadHTML($bib_html);
$links = $bib_doc->getElementsByTagName('link'); $links = $bib_doc->getElementsByTagName('link');
foreach ($links as $link) { foreach ($links as $link) {
if ($link->getAttribute('rel') == 'unapi-server') { if ($link->getAttribute('rel') == 'unapi-server') {

Loading…
Cancel
Save