diff --git a/xc_search/import/xc_search_display_template_element.xml b/xc_search/import/xc_search_display_template_element.xml index a96e59a..b0dc5ce 100644 --- a/xc_search/import/xc_search_display_template_element.xml +++ b/xc_search/import/xc_search_display_template_element.xml @@ -167,4 +167,79 @@ elseif (isset({dcterms:date})) { return xc_util_get_metadata_value({dcterms:date}); } + + + + title + oai_dc + oai_dc + + + + + creator + oai_dc + oai_dc + + + + + format + oai_dc + oai_dc + + + + + date + oai_dc + oai_dc + + + + + publisher + oai_dc + oai_dc + + + + + + language + oai_dc + oai_dc + + + + + + subject + oai_dc + oai_dc + + diff --git a/xc_search/templates/oai_dc-full-mlt.tpl.php b/xc_search/templates/oai_dc-full-mlt.tpl.php new file mode 100644 index 0000000..462eceb --- /dev/null +++ b/xc_search/templates/oai_dc-full-mlt.tpl.php @@ -0,0 +1,41 @@ + + + +
+
+ + + + <?php print t('Cover image of !title', array('!title' => $title_clean)); ?> + + + + + + + + by + + +
+ \ No newline at end of file diff --git a/xc_search/templates/oai_dc-full.tpl.php b/xc_search/templates/oai_dc-full.tpl.php new file mode 100644 index 0000000..1d341e0 --- /dev/null +++ b/xc_search/templates/oai_dc-full.tpl.php @@ -0,0 +1,304 @@ + + +
+ + +
+
+ + + + + + + +
+ +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $enhancement): ?> + id=""> + + + + + $value) : ?> + + + + + + + + + + + + $values): ?> + + + + + + + +
:
:
: + + + + + + + +
: + + ; + + ; + +
:
:
:
:
:
: + +
:
+ + + +
:
: + + 1) : ?> +
    + +
    • + +
+ + + + + + +
+ +
+ +
+ + + + + + + + + + + + + + + + +
+

:

+ + + +
+ +
+
+ + + + +
+ +
+
+ +
+ \ No newline at end of file diff --git a/xc_search/templates/oai_dc-snippet.tpl.php b/xc_search/templates/oai_dc-snippet.tpl.php index 4c3f4e5..14ced06 100644 --- a/xc_search/templates/oai_dc-snippet.tpl.php +++ b/xc_search/templates/oai_dc-snippet.tpl.php @@ -1,11 +1,89 @@ - - + + + + class=""> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
:
:
:
:
: + + + + + + +
:
+ + +
+ FRBR level: manifestation + - [] + - [] + - [] + - [] + - [] + + - [] + + - + + [oclc] + + +
+ \ No newline at end of file diff --git a/xc_search/templates/oai_dc-title.tpl.php b/xc_search/templates/oai_dc-title.tpl.php index eceabd6..4efe9a8 100644 --- a/xc_search/templates/oai_dc-title.tpl.php +++ b/xc_search/templates/oai_dc-title.tpl.php @@ -1,13 +1,21 @@ - - - - - + + +
+ +
+ + + +
+ by +
+ + diff --git a/xc_search/xc_search.module b/xc_search/xc_search.module index 34da4cd..34ee012 100644 --- a/xc_search/xc_search.module +++ b/xc_search/xc_search.module @@ -4139,7 +4139,7 @@ function xc_search_full_action_form(&$form_state, $xc_record) { $form = array( '#theme' => 'xc_search_full_action_form', ); - $bookmark_id = xc_account_get_bookmark_id($user->uid, $nid); + //FIXME: let PK know $bookmark_id = xc_account_get_bookmark_id($user->uid, $nid); $form['uid'] = array( '#type' => 'hidden', @@ -4480,6 +4480,320 @@ function template_preprocess_manifestation_snippet(&$variables) { } } // template_preprocess_manifestation_snippet + + +/** + * :Than + * Preprocess template variables for oai_dc snippet. + * + * Preserved variables: template_files, zebra, directory, is_admin, is_front, + * logged_in, db_is_active, user + * Parameters: base_url, id, xc_record, element, frbr + * + * @param $variables + */ +function template_preprocess_oai_dc_snippet(&$variables) { + static $link_options, $online_link_strategy; + + // TODO: + // problems: + // $variables['xc_record']['dcterms:extent'] always contains a ' :' at the end + + $variables['publisher'] = xc_util_conditional_join(', ', $variables['element']['publisher']); + $variables['date'] = xc_util_conditional_join(', ', $variables['element']['date']); + $variables['format'] = xc_util_conditional_join(', ', $variables['element']['format']); + + //$variables['format'] = xc_search_get_manifestation_formats($variables['xc_record']['format']); $variables['is_journal'] = preg_match('/\b' . t('Journals') . '\b/', $variables['format']); + + if (isset($variables['xc_record']['dc:identifier']) + && xc_util_contains_url(xc_util_get_metadata_value($variables['xc_record']['dc:identifier']))) { + $variables['get_availability'] = FALSE; + $variables['online_links'] = xc_util_get_metadata_value($variables['xc_record']['dc:identifier']); + } +} // template_preprocess_manifestation_snippet + + + +/** +* :Than OAI_DC title template +* It uses Title and creator display template elements. So make sure that they are added via XC Admin interface +**/ +function template_preprocess_oai_dc_title(&$variables) { + timer_start('theme_xc_search_metadata/oai_dc_title/template_preprocess'); + + $variables['title'] = xc_util_conditional_join(' — ', $variables['element']['title']); + $creators = (array)$variables['element']['creator']; + if (count($creators) > 1) { + $ui = xc_search_variable('search_ui'); + switch ($ui->authors_count) { + // all creators + case -1: break; + // none of them + case 0: + $creators = array(); + break; + + default: + $has_more = (count($creators) > $ui->authors_count); + $creators = array_slice($creators, 0, $ui->authors_count); + if ($has_more) { + $creators[] = '…'; + } + break; + } + } + + $variables['creator'] = xc_util_conditional_join(' — ', $creators); + + if (!empty($variables['xc_record']['full_display_url'])) { + $variables['title_link'] = l( + $variables['title'], // link text + $variables['xc_record']['full_display_url'], // URL full_display_url + array('html' => TRUE, 'absolute' => TRUE) + ); + if (!empty($variables['creator'])) { + $variables['creator_link'] = l( + $variables['creator'], + $variables['xc_record']['full_display_url'], + array('html' => TRUE, 'absolute' => TRUE) + ); + } + } + else { + $variables['title_link'] = $variables['title']; + if (!empty($variables['creator'])) { + $variables['creator_link'] = $variables['creator']; + } + } + timer_stop('theme_xc_search_metadata/oai_dc_title/template_preprocess'); +} + + +/** + * :Than + * Preprocess full display template for OAI_DC + * @param $variables + */ + +function template_preprocess_oai_dc_full(&$variables) { + timer_start('template_preprocess_oai_dc_full'); + + $author_field_names = array('dc:creator' => t('creator')); + + $contributor_field_names = array('dcterms:contributor' => t('contributor')); + + $authors_contibutors = array(); + + //create author links form dc:creator + if (is_array($variables['xc_record']['dc:creator'])) { + $creators = array_unique((array)$variables['xc_record']['creator_author']); + } + $links = array(); + $link_options = array( + 'phrase' => 1, + 'facet' => 1, + ); + foreach ($creators as $creator) { + $links[] = array( + xc_util_make_link($creator, 'creator_author_fc', $link_options), + l(t('(Search WorldCat Identities)'), 'xc_search/ajax/open_worldcat_identity_url', + array('query' => 'sURL=' . rawurlencode($creator))), + ); + } + if (!empty($links)) { + if (count($links) == 1) { + $variables['top_author_links'] = $links[0][0] . '   ' . $links[0][1]; + } + elseif (count($links) <= 4) { + $variables['top_author_links'] = theme('table', array(), $links, array('id' => 'xc-authors-list')); + } + else { //if it's more than four creators, then hide the rest + $items = array(); + foreach ($links as $i => $link) { + if ($i < 4) { + $items[] = $link; + } + else { + $items[] = array('data' => $link, 'class' => 'xc-hidden-author'); + } + } + $items[] = array( + 'data' => array(t('!count more', + array('!count' => intval(count($links)-4)))), + 'id' => 'xc-show-hidden-authors' + ); + $variables['top_author_links'] = theme('table', array(), $items, array('id' => 'xc-authors-list')); + drupal_add_js(drupal_get_path('module', 'xc_search') . '/js/xc_manifestation.js'); + } + } + + //end of getting author links + + foreach ($contributor_field_names as $field_name => $label) { + if (isset($variables['xc_record'][$field_name])) { + if (is_array($variables['xc_record'][$field_name])) { + foreach (xc_util_get_metadata_value($variables['xc_record'][$field_name]) as $author) { + $authors_contibutors[$author]['fields'][] = $field_name; + $authors_contibutors[$author]['labels'][] = $label; + } + } + else { + $authors_contibutors[$variables['xc_record'][$field_name]]['fields'][] = $field_name; + $authors_contibutors[$variables['xc_record'][$field_name]]['labels'][] = $label; + } + } + } + + $links = array(); + foreach ($authors_contibutors as $contributor => $info) { + // it retrieves always ONE link + $raw_links = xc_util_conditional_joined_link(NULL, $contributor, + 'other_contributors_fc', array('phrase' => 1, 'facet' => 1, 'debug' => 1)); + foreach ($raw_links as $link) { + $links[] = $link . ' ('. join(', ', $info['labels']) . ')'; + } + } + if (!empty($links)) { + $variables['all_author_links'] = $links; + } + + $variables['ajax_loader_img'] = drupal_get_path('module', 'xc_search') . '/images/ajax-loader.gif'; + + /* + $variables['publisher'] = xc_util_conditional_joined_link(', ', + $variables['element']['publisher'], 'dcterms:publisher'); + */ + $variables['publisher'] = xc_util_conditional_join(', ', $variables['element']['publisher']); + + $variables['date'] = xc_util_conditional_join(', ', $variables['element']['date']); + // $variables['format'] = xc_util_conditional_join(', ', $variables['element']['format']); + $variables['format'] = xc_search_get_manifestation_formats($variables['xc_record']['format']); + + $variables['language'] = xc_util_conditional_join('—', $variables['element']['language']); + $variables['title'] = xc_util_conditional_join(', ', $variables['element']['title']); + $variables['creator'] = xc_util_conditional_join(', ', $variables['element']['creator']); + + $variables['node_id'] = $variables['xc_record']['node_id']; + $variables['image_url_large'] = $variables['xc_record']['image_url_large']; + $variables['image_url_medium'] = $variables['xc_record']['image_url_medium']; + + /** + // ISBN + if (isset($variables['xc_record']['dcterms:identifier'])) { + $variables['ISBN'] = xc_util_conditional_join(' — ', xc_util_get_metadata_value($variables['xc_record']['dcterms:identifier'], array('@type' => 'ISBN'))); + } + + // ISSN + $variables['ISSN'] = xc_util_conditional_join(' — ', + xc_util_get_metadata_values($variables['xc_record'], array( + 'dcterms:identifier' => array('@type' => 'ISSN'), + 'xc:identifier' => array('@type' => 'ISSN') + ) + )); + **/ + + + $fields = array( + 'description' => 'dc:description', + 'coverage' => 'dc:coverage', + 'rights' => 'dc:rights', + 'source' => 'dc:source', + ); + foreach ($fields as $variable => $schemafield) { + if (isset($variables['xc_record'][$schemafield])) { + $variables[$variable] = xc_util_conditional_join( + ' — ', + xc_util_get_metadata_value($variables['xc_record'][$schemafield]) + ); + } + } + //$variables['summary'] = xc_util_conditional_join('
', $variables['xc_record']['summary']); + + $subj_key = 'dc:subject'; + $subj_name = 'subject'; + // applying subject_spatial, subject_topic, subject_temporal + if ( !empty($variables['xc_record'][$subj_key])) { + $subjects = xc_util_get_metadata_value($variables['xc_record'][$subj_key]); + $solr_field = $subj_name . '_fc'; + foreach ($subjects as $term) { + $solr_query = $solr_field . ':"' . $term . '"'; + $variables[$subj_name][] = l($term, + 'xc/search/*', // . urlencode($solr_query), + array('query' => array( + 'filter' => array($solr_query), + 'reuse_filter' => 1, + 'ql' => 1) + ) + ); + } + } + + $identifiers = array(); + if (isset($variables['xc_record']['dc:identifier'])) { + $identifiers = xc_util_get_metadata_value($variables['xc_record']['dc:identifier']); + if (!is_array($identifiers)) { + $identifiers = array($identifiers); + } + } + + // if the dc:identifier is a URL link create a link + $variables['url_identifiers'] = array(); + $options = array( + 'external' => 1, + 'regex' => '{(https?|ftp)://[^ ]+}', + 'shorten' => 1, + ); + foreach ($identifiers as $identifier) { + if (preg_match("{(https?|ftp)://[^ ]+}", $identifier)) { + $variables['url_identifiers'][] = xc_util_make_link($identifier, '', $options); + } + } + + $variables['has_admin_right'] = user_access(ADMINISTER_XC_SEARCH); + + $relations = array(); + if (!empty($variables['xc_record']['dc:relation'])) { + $relations = xc_util_get_metadata_value($variables['xc_record']['dc:relation']); + } + + if (!empty($relations)) { + xc_util_link_walk($relations, '', array('external' => 1, 'regex' => '{(https?|ftp)://[^ ]+}')); + $variables['relations'] = $relations; + } + + $variables['mlts'] =& $variables['xc_record']['mlts']; + $variables['enhancements'] = $variables['xc_record']['enhancements']; + $variables['action_buttons'] =& $variables['xc_record']['action_buttons']; + + timer_stop('template_preprocess_oai_dc_full'); +}//template_preprocess_oai_dc_full + +/** + * :Than preprocess function for oai_dc_full_mlt theme + * + * @param $variables (Array) + * The variables available to the theme + */ +function template_preprocess_oai_dc_full_mlt(&$variables) { + $variables += $variables['mlt']; + if ($variables['show'] == 'title') { + $variables['show'] = ($variables['title_link']); + unset($variables['image_url']); + } + elseif ($variables['show'] == 'image') { + $variables['show'] = ($variables['image_url']); + unset($variables['title_link']); + } + elseif ($variables['title_link'] || $variables['image_url']) { + $variables['show'] = TRUE; + } + else { + $variables['show'] = FALSE; + } +}//template_preprocess_oai_dc_full_mlt + + + function template_preprocess_manifestation_title(&$variables) { timer_start('theme_xc_search_metadata/manifestation_title/template_preprocess'); @@ -5089,6 +5403,16 @@ function xc_search_theme() { 'show' => TRUE, ), ), + //:Than OAI_DC more like this template + 'oai_dc_full_mlt' => array( + 'template' => 'templates/oai_dc-full-mlt', + 'arguments' => array( + 'mlt' => NULL, + 'count' => NULL, + 'show' => TRUE, + ), + ), + 'xc_search_no_results' => array( 'arguments' => array('title' => NULL, 'content' => NULL), ), diff --git a/xc_solr/xc_solr.index.inc b/xc_solr/xc_solr.index.inc index 8925626..fe2c9a6 100644 --- a/xc_solr/xc_solr.index.inc +++ b/xc_solr/xc_solr.index.inc @@ -258,8 +258,7 @@ function xc_solr_onestop_indexer($metadata_id) { $document->addField('metadata_tsn', serialize($metadata), FALSE, TRUE); $document->setField('text', join(' ', $document->text)); //Fix for SEVERE: org.apache.solr.common.SolrException: ERROR:unknown field 'highlight_txt' - - $document->setField('highlight_t', join(' ', $document->highlight)); + $document->setField('highlight_t', $document->highlight); $ft1 = microtime(TRUE); @@ -965,7 +964,9 @@ function xc_solr_metadata_to_solr_iterate_indexes(&$object, &$document = NULL) { foreach ($element_instance as $key => $value) { if ($key == '#value') { $all_fields .= $value . ' '; - if (!in_array($field, $cache['not_in_highlight'])) { + //Fix for the error warning: in_array() expects parameter 2 to be array, + //null given in /var/www/xc-patch/sites/all/modules/xc/xc_solr/xc_solr.index.inc on line 968. + if (!is_array($cache['not_in_highlight']) || !in_array($field, $cache['not_in_highlight'])) { $highlight .= $value . ' '; } } // foreach element_instances