Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1784234 by linclark: Use schema.org types and properties in RDF mappings.

8.0.x
Dries 2013-07-03 12:29:13 -04:00
parent d5c0b6dc7d
commit 36975492e9
17 changed files with 665 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/modules/forum/config/rdf.mapping.node.forum.yml
View File

@ -2,10 +2,27 @@ id: node.forum
targetEntityType: node
bundle: forum
types:
- 'sioc:Post'
- 'sioct:BoardPost'
- 'schema:Discussion'
fieldMappings:
taxonomy_forums:
title:
properties:
- 'sioc:has_container'
- 'schema:name'
created:
properties:
- 'schema:dateCreated'
datatype_callback: 'date_iso8601'
changed:
properties:
- 'schema:dateModified'
datatype_callback: 'date_iso8601'
body:
properties:
- 'schema:text'
uid:
properties:
- 'schema:author'
mapping_type: 'rel'
comment_count:
properties:
- 'schema:interactionCount'
datatype_callback: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'

7
core/modules/forum/config/rdf.mapping.taxonomy_term.forums.yml
View File

@ -4,3 +4,10 @@ bundle: forums
types:
- 'sioc:Container'
- 'sioc:Forum'
fieldMappings:
name:
properties:
- 'schema:name'
description:
properties:
- 'schema:description'

26
core/modules/rdf/lib/Drupal/rdf/CommonDataConverter.php Normal file
View File

@ -0,0 +1,26 @@
<?php
/**
* @file
* Contains \Drupal\rdf\CommonDataConverter.
*/
namespace Drupal\rdf;
/**
* Contains methods for common data conversions.
*/
class CommonDataConverter {
/**
* Provides a passthrough to place unformatted values in content attributes.
*
* @param mixed $data
* The data to be placed in the content attribute.
*
* @return mixed
* Returns the data.
*/
static function rawValue($data) {
return $data;
}
}

29
core/modules/rdf/lib/Drupal/rdf/SchemaOrgDataConverter.php Normal file
View File

@ -0,0 +1,29 @@
<?php
/**
* @file
* Contains \Drupal\rdf\SchemaOrgDataConverter.
*/
namespace Drupal\rdf;
class SchemaOrgDataConverter {
/**
* Converts an interaction count to a string with the interaction type.
*
* Schema.org defines a number of different interaction types.
*
* @param int $count
* The interaction count.
*
* @return string
* The formatted string.
*
* @see http://schema.org/UserInteraction
* @todo Support other interaction types, see https://drupal.org/node/2020001
*/
static function interactionCount($count) {
return "UserComment:$count";
}
}

5
core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
View File

@ -54,6 +54,7 @@ class CommentAttributesTest extends CommentTestBase {
$comment_count_mapping = array(
'properties' => array('sioc:num_replies'),
'datatype' => 'xsd:integer',
'datatype_callback' => 'Drupal\rdf\CommonDataConverter::rawValue',
);
$article_mapping->setFieldMapping('comment_count', $comment_count_mapping)->save();
@ -69,7 +70,7 @@ class CommentAttributesTest extends CommentTestBase {
$mapping = rdf_get_mapping('comment', 'comment_node_article');
$mapping->setBundleMapping(array('types' => array('sioc:Post', 'sioct:Comment')))->save();
$field_mappings = array(
'title' => array(
'subject' => array(
'properties' => array('dc:title'),
),
'created' => array(
@ -251,7 +252,7 @@ class CommentAttributesTest extends CommentTestBase {
'value' => $comment->subject->value,
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($comment_uri, 'http://purl.org/dc/terms/title', $expected_value), 'Comment title found in RDF output (dc:title).');
$this->assertTrue($graph->hasProperty($comment_uri, 'http://purl.org/dc/terms/title', $expected_value), 'Comment subject found in RDF output (dc:title).');
// Comment date.
$expected_value = array(

22
core/modules/rdf/lib/Drupal/rdf/Tests/RdfaAttributesTest.php
View File

@ -84,6 +84,28 @@ class RdfaAttributesTest extends DrupalUnitTestBase {
$this->_testAttributes($expected_attributes, $mapping, $date);
}
/**
* Test attribute creation for mappings which use data converters.
*/
function testDatatypeCallbackWithConverter() {
$properties = array('schema:interactionCount');
$data = "23";
$content = "UserComment:23";
$mapping = array(
'properties' => $properties,
'datatype_callback' => 'Drupal\rdf\SchemaOrgDataConverter::interactionCount',
);
$expected_attributes = array(
'property' => $properties,
'content' => $content,
);
$this->_testAttributes($expected_attributes, $mapping, $data);
}
/**
* Test attribute creation for mappings which use 'rel'.
*/

485
core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php Normal file
View File

@ -0,0 +1,485 @@
<?php
/**
* @file
* Contains \Drupal\rdf\Tests\StandardProfileTest
*/
namespace Drupal\rdf\Tests;
use Drupal\simpletest\WebTestBase;
/**
* Tests that the standard profile mappings are set and exposed as expected.
*/
class StandardProfileTest extends WebTestBase {
public $profile = 'standard';
public static function getInfo() {
return array(
'name' => 'Standard profile RDF',
'description' => 'Tests the RDF mappings and RDFa markup of the standard profile.',
'group' => 'RDF',
);
}
public function setUp() {
parent::setUp();
$this->base_uri = url('<front>', array('absolute' => TRUE));
// Create two test users.
$this->adminUser = $this->drupalCreateUser(array(
'administer content types',
'administer comments',
'access comments',
'access content',
));
$this->webUser = $this->drupalCreateUser(array(
'access comments',
'post comments',
'skip comment approval',
'access content',
));
$this->drupalLogin($this->adminUser);
// Create term.
$this->term = entity_create('taxonomy_term', array(
'name' => $this->randomName(),
'description' => $this->randomName(),
'vid' => 'tags',
));
$this->term->save();
// Create image.
file_unmanaged_copy(DRUPAL_ROOT . '/core/misc/druplicon.png', 'public://example.jpg');
$this->image = entity_create('file', array('uri' => 'public://example.jpg'));
$this->image->save();
// Create article.
$article_settings = array(
'type' => 'article',
'promote' => NODE_PROMOTED,
'field_image' => array(
array(
'target_id' => $this->image->id(),
),
),
'field_tags' => array(
array(
'target_id' => $this->term->id(),
),
),
);
$this->article = $this->drupalCreateNode($article_settings);
// Create second article to test teaser list.
$this->drupalCreateNode(array('type' => 'article', 'promote' => NODE_PROMOTED,));
// Create article comment.
$this->articleComment = $this->saveComment($this->article->id(), $this->webUser->id(), NULL, 0, 'comment_node_article');
// Create page.
$this->page = $this->drupalCreateNode(array('type' => 'page'));
// Set URIs.
// Image.
$image_file = file_load($this->article->get('field_image')->offsetGet(0)->get('target_id')->getValue());
$this->imageUri = image_style_url('large', $image_file->getFileUri());
// Term.
$term_uri_info = $this->term->uri();
$this->termUri = url($term_uri_info['path'], array('absolute' => TRUE));
// Article.
$article_uri_info = $this->article->uri();
$this->articleUri = url($article_uri_info['path'], array('absolute' => TRUE));
// Page.
$page_uri_info = $this->page->uri();
$this->pageUri = url($page_uri_info['path'], array('absolute' => TRUE));
// Author.
$this->authorUri = url('user/' . $this->adminUser->uid, array('absolute' => TRUE));
// Comment.
$article_comment_uri_info = $this->articleComment->uri();
$this->articleCommentUri = url($article_comment_uri_info['path'], array('absolute' => TRUE));
// Commenter.
$commenter_uri_info = $this->webUser->uri();
$this->commenterUri = url($commenter_uri_info['path'], array('absolute' => TRUE));
$this->drupalLogout();
}
/**
* Test that data is exposed correctly when using standard profile.
*
* Because tests using standard profile take a very long time to run, and
* because there is no manipulation of config or data within the test, simply
* run all the tests from within this function.
*/
public function testRdfaOutput() {
$this->_testFrontPageRDFa();
$this->_testArticleRDFa();
$this->_testPageRDFa();
$this->_testUserRDFa();
$this->_testTermRDFa();
}
/**
* Test that data is exposed in the front page teasers.
*/
protected function _testFrontPageRDFa() {
// Feed the HTML into the parser.
$path = 'node';
$graph = $this->getRdfGraph($path);
// Ensure that both articles are listed.
$this->assertEqual(2, count($graph->allOfType('http://schema.org/Article')), 'Two articles found on front page.');
// Test interaction count.
$expected_value = array(
'type' => 'literal',
'value' => 'UserComment:1',
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/interactionCount', $expected_value), "Teaser comment count was found (schema:interactionCount).");
// Test the properties that are common between pages and articles and are
// displayed in full and teaser mode.
$this->_testCommonNodeProperties($graph, $this->article, "Teaser");
// Test properties that are displayed in both teaser and full mode.
$this->_testArticleProperties($graph, "Teaser");
// Title.
// @todo Once the title data is output consistently between full and teaser
// view modes, move this to _testCommonNodeProperties().
$title = $this->article->get('title')->offsetGet(0)->get('value')->getValue();
$expected_value = array(
'type' => 'literal',
// The teaser title parses with additional whitespace.
'value' => "
$title
",
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/name', $expected_value), "Teaser title was found (schema:name).");
// @todo Once the image points to the original instead of the processed
// image, move this to testArticleProperties().
$image_file = file_load($this->article->get('field_image')->offsetGet(0)->get('target_id')->getValue());
$image_uri = image_style_url('medium', $image_file->getFileUri());
$expected_value = array(
'type' => 'uri',
'value' => $image_uri,
);
$this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/image', $expected_value), "Teaser image was found (schema:image).");
}
/**
* Test that article data is exposed using RDFa.
*
* Two fields are not tested for output here. Changed date is not displayed
* on the page, so there is no test for output in node view. Comment count is
* displayed in teaser view, so it is tested in the front article tests.
*/
protected function _testArticleRDFa() {
// Feed the HTML into the parser.
$uri_info = $this->article->uri();
$path = $uri_info['path'];
$graph = $this->getRdfGraph($path);
// Type.
$this->assertEqual($graph->type($this->articleUri), 'schema:Article', 'Article type was found (schema:Article).');
// Test the properties that are common between pages and articles.
$this->_testCommonNodeProperties($graph, $this->article, "Article");
// Test properties that are displayed in both teaser and full mode.
$this->_testArticleProperties($graph, "Article");
// Test the comment properties displayed on articles.
$this->_testNodeCommentProperties($graph);
// Title.
// @todo Once the title data is output consistently between full and teaser
// view modes, move this to _testCommonNodeProperties().
$expected_value = array(
'type' => 'literal',
'value' => $this->article->get('title')->offsetGet(0)->get('value')->getValue(),
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/name', $expected_value), "Article title was found (schema:name).");
// @todo Once the image points to the original instead of the processed
// image, move this to testArticleProperties().
$expected_value = array(
'type' => 'uri',
'value' => $this->imageUri,
);
$this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/image', $expected_value), "Article image was found (schema:image).");
}
/**
* Test that page data is exposed using RDFa.
*
* Two fields are not tested for output here. Changed date is not displayed
* on the page, so there is no test for output in node view. Comment count is
* displayed in teaser view, so it is tested in the front page tests.
*/
protected function _testPageRDFa() {
// The standard profile hides the created date on pages. Revert display to
// true for testing.
variable_set('node_submitted_page', TRUE);
// Feed the HTML into the parser.
$uri_info = $this->page->uri();
$path = $uri_info['path'];
$graph = $this->getRdfGraph($path);
// Type.
$this->assertEqual($graph->type($this->pageUri), 'schema:WebPage', 'Page type was found (schema:WebPage).');
// Test the properties that are common between pages and articles.
$this->_testCommonNodeProperties($graph, $this->page, "Page");
// Title.
// @todo Once the title data is output consistently between full and teaser
// view modes, move this to _testCommonNodeProperties().
$expected_value = array(
'type' => 'literal',
'value' => $this->page->get('title')->offsetGet(0)->get('value')->getValue(),
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($this->pageUri, 'http://schema.org/name', $expected_value), "Page title was found (schema:name).");
}
/**
* Test that user data is exposed on user page.
*/
function _testUserRDFa() {
$this->drupalLogin($this->root_user);
// Feed the HTML into the parser.
$uri_info = $this->adminUser->uri();
$path = $uri_info['path'];
$graph = $this->getRdfGraph($path);
// User type.
$this->assertEqual($graph->type($this->authorUri), 'schema:Person', "User type was found (schema:Person) on user page.");
// User name.
$expected_value = array(
'type' => 'literal',
'value' => $this->adminUser->name,
);
$this->assertTrue($graph->hasProperty($this->authorUri, 'http://schema.org/name', $expected_value), "User name was found (schema:name) on user page.");
$this->drupalLogout();
}
/**
* Test that term data is exposed on term page.
*/
function _testTermRDFa() {
// Feed the HTML into the parser.
$uri_info = $this->term->uri();
$path = $uri_info['path'];
$graph = $this->getRdfGraph($path);
// Term type.
$this->assertEqual($graph->type($this->termUri), 'schema:Thing', "Term type was found (schema:Thing) on term page.");
// Term name.
$expected_value = array(
'type' => 'literal',
'value' => $this->term->get('name')->offsetGet(0)->get('value')->getValue(),
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($this->termUri, 'http://schema.org/name', $expected_value), "Term name was found (schema:name) on term page.");
// @todo Add test for term description once it is a field:
// https://drupal.org/node/569434
}
/**
* Test output for properties held in common between articles and pages.
*
* @param \EasyRdf_Graph $graph
* The EasyRDF graph object.
* @param \Drupal\node\Plugin\Core\Entity\Node $node
* The node being displayed.
* @param string $message_prefix
* The word to use in the test assertion message.
*/
function _testCommonNodeProperties($graph, $node, $message_prefix) {
$uri_info = $node->uri();
$uri = url($uri_info['path'], array('absolute' => TRUE));
// Created date.
$expected_value = array(
'type' => 'literal',
'value' => date_iso8601($node->get('created')->offsetGet(0)->get('value')->getValue()),
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($uri, 'http://schema.org/dateCreated', $expected_value), "$message_prefix created date was found (schema:dateCreated) in teaser.");
// Body.
$expected_value = array(
'type' => 'literal',
'value' => $node->get('body')->offsetGet(0)->get('value')->getValue(),
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($uri, 'http://schema.org/text', $expected_value), "$message_prefix body was found (schema:text) in teaser.");
// Author.
$expected_value = array(
'type' => 'uri',
'value' => $this->authorUri,
);
$this->assertTrue($graph->hasProperty($uri, 'http://schema.org/author', $expected_value), "$message_prefix author was found (schema:author) in teaser.");
// Author type.
$this->assertEqual($graph->type($this->authorUri), 'schema:Person', "$message_prefix author type was found (schema:Person).");
// Author name.
$expected_value = array(
'type' => 'literal',
'value' => $this->adminUser->name,
);
$this->assertTrue($graph->hasProperty($this->authorUri, 'http://schema.org/name', $expected_value), "$message_prefix author name was found (schema:name).");
}
/**
* Test output for article properties displayed in both view modes.
*
* @param \EasyRdf_Graph $graph
* The EasyRDF graph object.
* @param string $message_prefix
* The word to use in the test assertion message.
*/
function _testArticleProperties($graph, $message_prefix) {
// Tags.
$expected_value = array(
'type' => 'uri',
'value' => $this->termUri,
);
$this->assertTrue($graph->hasProperty($this->articleUri, 'http://schema.org/about', $expected_value), "$message_prefix tag was found (schema:about).");
// Tag type.
$this->assertEqual($graph->type($this->termUri), 'schema:Thing', 'Tag type was found (schema:Thing).');
// Tag name.
$expected_value = array(
'type' => 'literal',
'value' => $this->term->get('name')->offsetGet(0)->get('value')->getValue(),
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($this->termUri, 'http://schema.org/name', $expected_value), "$message_prefix name was found (schema:name).");
}
/**
* Test output for comment properties on nodes in full page view mode.
*
* @param \EasyRdf_Graph $graph
* The EasyRDF graph object.
*/
function _testNodeCommentProperties($graph) {
// @todo Test relationship between comment and node once it is a field:
// https://drupal.org/node/731724
// Comment type.
$this->assertEqual($graph->type($this->articleCommentUri), 'schema:Comment', 'Comment type was found (schema:Comment).');
// Comment title.
$expected_value = array(
'type' => 'literal',
'value' => $this->articleComment->get('subject')->offsetGet(0)->get('value')->getValue(),
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($this->articleCommentUri, 'http://schema.org/name', $expected_value), 'Article comment title was found (schema:name).');
// Comment created date.
$expected_value = array(
'type' => 'literal',
'value' => date_iso8601($this->articleComment->get('created')->offsetGet(0)->get('value')->getValue()),
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($this->articleCommentUri, 'http://schema.org/dateCreated', $expected_value), 'Article comment created date was found (schema:dateCreated).');
// Comment body.
$text = $this->articleComment->get('comment_body')->offsetGet(0)->get('value')->getValue();
$expected_value = array(
'type' => 'literal',
// There is an extra carriage return in the when parsing comments as
// output by Bartik, so it must be added to the expected value.
'value' => "$text
",
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($this->articleCommentUri, 'http://schema.org/text', $expected_value), 'Article comment body was found (schema:text).');
// Comment uid.
$expected_value = array(
'type' => 'uri',
'value' => $this->commenterUri,
);
$this->assertTrue($graph->hasProperty($this->articleCommentUri, 'http://schema.org/author', $expected_value), 'Article comment author was found (schema:author).');
// Comment author type.
$this->assertEqual($graph->type($this->commenterUri), 'schema:Person', 'Comment author type was found (schema:Person).');
// Comment author name.
$expected_value = array(
'type' => 'literal',
'value' => $this->webUser->get('name')->offsetGet(0)->get('value')->getValue(),
);
$this->assertTrue($graph->hasProperty($this->commenterUri, 'http://schema.org/name', $expected_value), 'Comment author name was found (schema:name).');
}
/**
* Creates a comment entity.
*
* @param int $nid
* Node id which will hold the comment.
* @param int $uid
* User id of the author of the comment. Can be NULL if $contact provided.
* @param mixed $contact
* Set to NULL for no contact info, TRUE to ignore success checking, and
* array of values to set contact info.
* @param int $pid
* Comment id of the parent comment in a thread.
* @param string $bundle
* The bundle of the comment.
*
* @return \Drupal\comment\Plugin\Core\Entity\Comment
* The saved comment.
*/
function saveComment($nid, $uid, $contact = NULL, $pid = 0, $bundle = '') {
$values = array(
'nid' => $nid,
'uid' => $uid,
'pid' => $pid,
'node_type' => $bundle,
'subject' => $this->randomName(),
'comment_body' => $this->randomName(),
'status' => 1,
);
if ($contact) {
$values += $contact;
}
$comment = entity_create('comment', $values);
$comment->save();
return $comment;
}
/**
* Get the EasyRdf_Graph object for a page.
*
* @param string $path
* The relative path to the page being tested.
*
* @return \EasyRdf_Graph
* The RDF graph object.
*/
function getRdfGraph($path) {
$parser = new \EasyRdf_Parser_Rdfa();
$graph = new \EasyRdf_Graph();
$parser->parse($graph, $this->drupalGet($path), 'rdfa', $this->base_uri);
return $graph;
}
}

3
core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyAttributesTest.php
View File

@ -77,5 +77,8 @@ class TaxonomyAttributesTest extends TaxonomyTestBase {
'lang' => 'en',
);
$this->assertTrue($graph->hasProperty($term_uri, 'http://www.w3.org/2004/02/skos/core#prefLabel', $expected_value), 'Term label found in RDF output (skos:prefLabel).');
// @todo Add test for term description once it is a field:
// https://drupal.org/node/569434
}
}

13
core/modules/rdf/lib/Drupal/rdf/Tests/UserAttributesTest.php
View File

@ -76,19 +76,6 @@ class UserAttributesTest extends WebTestBase {
'value' => $user2->name,
);
$this->assertTrue($graph->hasProperty($account_uri, 'http://xmlns.com/foaf/0.1/name', $expected_value), 'User name found in RDF output (foaf:name).');
// Person type.
$expected_value = array(
'type' => 'uri',
'value' => 'http://xmlns.com/foaf/0.1/Person',
);
$this->assertTrue($graph->hasProperty($person_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Person type found in RDF output (foaf:Person).');
// Person relation to account.
$expected_value = array(
'type' => 'uri',
'value' => $account_uri,
);
$this->assertTrue($graph->hasProperty($person_uri, 'http://xmlns.com/foaf/0.1/account', $expected_value), 'Person relation to account found in RDF output (foaf:account).');
// User 2 creates a node.
$this->drupalLogin($user2);

23
core/modules/rdf/rdf.module
View File

@ -92,6 +92,7 @@ function rdf_rdf_namespaces() {
'foaf' => 'http://xmlns.com/foaf/0.1/',
'og' => 'http://ogp.me/ns#',
'rdfs' => 'http://www.w3.org/2000/01/rdf-schema#',
'schema' => 'http://schema.org/',
'sioc' => 'http://rdfs.org/sioc/ns#',
'sioct' => 'http://rdfs.org/sioc/types#',
'skos' => 'http://www.w3.org/2004/02/skos/core#',
@ -174,7 +175,7 @@ function rdf_rdfa_attributes($mapping, $data = NULL) {
// Convert $data to a specific format as per the callback function.
if (isset($data) && !empty($mapping['datatype_callback'])) {
$callback = $mapping['datatype_callback'];
$attributes['content'] = $callback($data);
$attributes['content'] = call_user_func($callback, $data);
}
if (isset($mapping['datatype'])) {
$attributes['datatype'] = $mapping['datatype'];
@ -295,11 +296,7 @@ function rdf_preprocess_node(&$variables) {
if (isset($variables['node']->comment_count) && !empty($comment_count_mapping['properties'])) {
// Annotates the 'x comments' link in teaser view.
if (isset($variables['content']['links']['comment']['#links']['comment-comments'])) {
$comment_count_attributes['property'] = $comment_count_mapping['properties'];
$comment_count_attributes['content'] = $variables['node']->comment_count;
if (isset($comment_count_mapping['datatype'])) {
$comment_count_attributes['datatype'] = $comment_count_mapping['datatype'];
}
$comment_count_attributes = rdf_rdfa_attributes($comment_count_mapping, $variables['node']->comment_count);
// According to RDFa parsing rule number 4, a new subject URI is created
// from the href attribute if no rel/rev attribute is present. To get the
// original node URL from the about attribute of the parent container we
@ -375,15 +372,6 @@ function rdf_preprocess_user(&$variables) {
// If we are on the user account page, add the relationship between the
// sioc:UserAccount and the foaf:Person who holds the account.
if (current_path() == $uri['path']) {
$account_holder_meta = array(
'#tag' => 'meta',
'#attributes' => array(
'about' => url($uri['path'], array_merge($uri['options'], array('fragment' => 'me'))),
'typeof' => array('foaf:Person'),
'rel' => array('foaf:account'),
'resource' => url($uri['path'], $uri['options']),
),
);
// Adds the markup for username as language neutral literal, see
// rdf_preprocess_username().
$name_mapping = $mapping->getPreparedFieldMapping('name');
@ -399,7 +387,6 @@ function rdf_preprocess_user(&$variables) {
);
drupal_add_html_head($username_meta, 'rdf_user_username');
}
drupal_add_html_head($account_holder_meta, 'rdf_user_account_holder');
}
}
@ -505,7 +492,7 @@ function rdf_preprocess_comment(&$variables) {
$variables['created'] .= $created_metadata_markup;
$variables['submitted'] .= $created_metadata_markup;
}
$title_mapping = $mapping->getPreparedFieldMapping('title');
$title_mapping = $mapping->getPreparedFieldMapping('subject');
if (!empty($title_mapping)) {
// Adds RDFa markup to the subject of the comment. Because the RDFa markup
// is added to an <h3> tag which might contain HTML code, we specify an
@ -517,6 +504,8 @@ function rdf_preprocess_comment(&$variables) {
// Annotates the parent relationship between the current comment and the node
// it belongs to. If available, the parent comment is also annotated.
// @todo When comments are turned into fields, this should be changed.
// Currently there is no mapping relating a comment to its node.
$pid_mapping = $mapping->getPreparedFieldMapping('pid');
if (!empty($pid_mapping)) {
// Adds the relation to the parent node.

9
core/modules/user/config/rdf.mapping.user.user.yml Normal file
View File

@ -0,0 +1,9 @@
id: user.user
targetEntityType: user
bundle: user
types:
- 'schema:Person'
fieldMappings:
name:
properties:
- 'schema:name'

25
core/profiles/standard/config/rdf.mapping.comment.comment_node_article.yml
View File

@ -2,34 +2,23 @@ id: comment.comment_node_article
targetEntityType: comment
bundle: comment_node_article
types:
- 'sioc:Post'
- 'sioct:Comment'
- 'schema:Comment'
fieldMappings:
title:
subject:
properties:
- 'dc:title'
- 'schema:name'
created:
properties:
- 'dc:date'
- 'dc:created'
datatype: 'xsd:dateTime'
- 'schema:dateCreated'
datatype_callback: 'date_iso8601'
changed:
properties:
- 'dc:modified'
datatype: 'xsd:dateTime'
- 'schema:dateModified'
datatype_callback: 'date_iso8601'
comment_body:
properties:
- 'content:encoded'
- 'schema:text'
uid:
properties:
- 'sioc:has_creator'
mapping_type: 'rel'
name:
properties:
- 'foaf:name'
pid:
properties:
- 'sioc:reply_of'
- 'schema:author'
mapping_type: 'rel'

24
core/profiles/standard/config/rdf.mapping.comment.comment_node_page.yml Normal file
View File

@ -0,0 +1,24 @@
id: comment.comment_node_page
targetEntityType: comment
bundle: comment_node_page
types:
- 'schema:Comment'
fieldMappings:
subject:
properties:
- 'schema:name'
created:
properties:
- 'schema:dateCreated'
datatype_callback: 'date_iso8601'
changed:
properties:
- 'schema:dateModified'
datatype_callback: 'date_iso8601'
comment_body:
properties:
- 'schema:text'
uid:
properties:
- 'schema:author'
mapping_type: 'rel'

33
core/profiles/standard/config/rdf.mapping.node.article.yml
View File

@ -2,48 +2,35 @@ id: node.article
targetEntityType: node
bundle: article
types:
- 'foaf:Document'
- 'sioc:Item'
- 'schema:Article'
fieldMappings:
title:
properties:
- 'dc:title'
- 'schema:name'
created:
properties:
- 'dc:date'
- 'dc:created'
datatype: 'xsd:dateTime'
- 'schema:dateCreated'
datatype_callback: 'date_iso8601'
changed:
properties:
- 'dc:modified'
datatype: 'xsd:dateTime'
- 'schema:dateModified'
datatype_callback: 'date_iso8601'
body:
properties:
- 'content:encoded'
- 'schema:text'
uid:
properties:
- 'sioc:has_creator'
- 'schema:author'
mapping_type: 'rel'
name:
properties:
- 'foaf:name'
comment_count:
properties:
- 'sioc:num_replies'
datatype: 'xsd:integer'
last_activity:
properties:
- 'sioc:last_activity_date'
datatype: 'xsd:dateTime'
datatype_callback: 'date_iso8601'
- 'schema:interactionCount'
datatype_callback: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'
field_image:
properties:
- 'og:image'
- 'rdfs:seeAlso'
- 'schema:image'
mapping_type: 'rel'
field_tags:
properties:
- 'dc:subject'
- 'schema:about'
mapping_type: 'rel'

28
core/profiles/standard/config/rdf.mapping.node.page.yml
View File

@ -2,39 +2,27 @@ id: node.page
targetEntityType: node
bundle: page
types:
- 'foaf:Document'
- 'sioc:Item'
- 'schema:WebPage'
fieldMappings:
title:
properties:
- 'dc:title'
- 'schema:name'
created:
properties:
- 'dc:date'
- 'dc:created'
datatype: 'xsd:dateTime'
- 'schema:dateCreated'
datatype_callback: 'date_iso8601'
changed:
properties:
- 'dc:modified'
datatype: 'xsd:dateTime'
- 'schema:dateModified'
datatype_callback: 'date_iso8601'
body:
properties:
- 'content:encoded'
- 'schema:text'
uid:
properties:
- 'sioc:has_creator'
- 'schema:author'
mapping_type: 'rel'
name:
properties:
- 'foaf:name'
comment_count:
properties:
- 'sioc:num_replies'
datatype: 'xsd:integer'
last_activity:
properties:
- 'sioc:last_activity_date'
datatype: 'xsd:dateTime'
datatype_callback: 'date_iso8601'
- 'schema:interactionCount'
datatype_callback: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'

8
core/profiles/standard/config/rdf.mapping.taxonomy_term.tags.yml
View File

@ -2,9 +2,11 @@ id: taxonomy_term.tags
targetEntityType: taxonomy_term
bundle: tags
types:
- 'skos:Concept'
- 'schema:Thing'
fieldMappings:
name:
properties:
- 'rdfs:label'
- 'skos:prefLabel'
- 'schema:name'
description:
properties:
- 'schema:description'

13
core/profiles/standard/config/rdf.mapping.user.user.yml
View File

@ -1,13 +0,0 @@
id: user.user
targetEntityType: user
bundle: user
types:
- 'sioc:UserAccount'
fieldMappings:
name:
properties:
- 'foaf:name'
homepage:
properties:
- 'foaf:page'
mapping_type: 'rel'