Author: sevein
Date: Thu May 3 13:20:02 2012
New Revision: 11607
Log:
Cosmetic changes
Modified:
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitActorMapping.class.php
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitContactInformationMapping.class.php
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitInformationObjectMapping.class.php
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitRepositoryMapping.class.php
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitTermMapping.class.php
Modified:
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitActorMapping.class.php
==============================================================================
---
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitActorMapping.class.php
Thu May 3 13:11:58 2012 (r11606)
+++
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitActorMapping.class.php
Thu May 3 13:20:02 2012 (r11607)
@@ -32,8 +32,8 @@
return array(
'slug' => array(
'type' => 'string',
- 'index' => 'not_analyzed'),
- ) + self::getI18nProperties();
+ 'index' => 'not_analyzed'))
+ + self::getI18nProperties();
}
static function serialize($object)
Modified:
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitContactInformationMapping.class.php
==============================================================================
---
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitContactInformationMapping.class.php
Thu May 3 13:11:58 2012 (r11606)
+++
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitContactInformationMapping.class.php
Thu May 3 13:20:02 2012 (r11607)
@@ -29,12 +29,23 @@
{
static function getProperties()
{
- return array('contactPerson' => array('type' => 'string', 'index' => 'no'),
- 'streetAddress' => array('type' => 'string', 'index' => 'no'),
- 'postalCode' => array('type' => 'string', 'include_in_all' =>
false),
- 'countryCode' => array('type' => 'string', 'index' =>
'not_analyzed', 'include_in_all' => false),
- 'location' => array('type' => 'geo_point'),
- ) + self::getI18nProperties();
+ return array(
+ 'contactPerson' => array(
+ 'type' => 'string',
+ 'index' => 'no'),
+ 'streetAddress' => array(
+ 'type' => 'string',
+ 'index' => 'no'),
+ 'postalCode' => array(
+ 'type' => 'string',
+ 'include_in_all' => false),
+ 'countryCode' => array(
+ 'type' => 'string',
+ 'index' => 'not_analyzed',
+ 'include_in_all' => false),
+ 'location' => array(
+ 'type' => 'geo_point'))
+ + self::getI18nProperties();
}
static function serialize($object)
Modified:
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitInformationObjectMapping.class.php
==============================================================================
---
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitInformationObjectMapping.class.php
Thu May 3 13:11:58 2012 (r11606)
+++
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitInformationObjectMapping.class.php
Thu May 3 13:20:02 2012 (r11607)
@@ -29,32 +29,77 @@
{
static function getProperties()
{
- return array('slug' => array('type' => 'string', 'index' =>
'not_analyzed'),
- 'referenceCode' => array('type' => 'string', 'index' =>
'not_analyzed'),
- 'identifier' => array('type' => 'string', 'index' =>
'not_analyzed'),
- 'levelOfDescriptionId' => array('type' => 'integer', 'index'
=> 'not_analyzed', 'include_in_all' => false),
- 'publicationStatusId' => array('type' => 'integer', 'index'
=> 'not_analyzed', 'include_in_all' => false),
- 'parentId' => array('type' => 'integer', 'index' =>
'not_analyzed', 'include_in_all' => false),
- 'ancestors' => array('type' => 'integer', 'index' =>
'not_analyzed', 'include_in_all' => false),
- 'children' => array('type' => 'integer', 'index' =>
'not_analyzed', 'include_in_all' => false),
- 'digitalObject' => array('type' => 'object', 'properties' =>
- array('mediaTypeId' => array('type' => 'integer', 'index'
=> 'not_analyzed', 'include_in_all' => false),
- 'thumbnail_FullPath' => array('type' => 'string',
'index' => 'no'),
- )
- ),
- 'dates' => array('type' => 'object', 'properties' =>
- array('startDate' => array('type' => 'integer', 'index' =>
'not_analyzed'),
- 'endDate' => array('type' => 'integer', 'index' =>
'not_analyzed'),
- 'typeId' => array('type' => 'string', 'index' =>
'not_analyzed', 'include_in_all' => false),
- 'actor' => array('type' => 'string'),
- )
- ),
- 'repository' => array('type' => 'object', 'properties' =>
QubitMapping::getI18nProperties()),
- 'subjects' => array('type' => 'object', 'properties' =>
QubitMapping::getI18nProperties()),
- 'places' => array('type' => 'object', 'properties' =>
QubitMapping::getI18nProperties()),
- 'names' => array('type' => 'object', 'properties' =>
QubitMapping::getI18nProperties()),
- 'creators' => array('type' => 'object', 'properties' =>
QubitMapping::getI18nProperties())
- ) + self::getI18nProperties();
+ return array(
+ 'slug' => array(
+ 'type' => 'string',
+ 'index' => 'not_analyzed'),
+ 'referenceCode' => array(
+ 'type' => 'string',
+ 'index' => 'not_analyzed'),
+ 'identifier' => array(
+ 'type' => 'string',
+ 'index' => 'not_analyzed'),
+ 'levelOfDescriptionId' => array(
+ 'type' => 'integer',
+ 'index' => 'not_analyzed',
+ 'include_in_all' => false),
+ 'publicationStatusId' => array(
+ 'type' => 'integer',
+ 'index' => 'not_analyzed',
+ 'include_in_all' => false),
+ 'parentId' => array(
+ 'type' => 'integer',
+ 'index' => 'not_analyzed',
+ 'include_in_all' => false),
+ 'ancestors' => array(
+ 'type' => 'integer',
+ 'index' => 'not_analyzed',
+ 'include_in_all' => false),
+ 'children' => array(
+ 'type' => 'integer',
+ 'index' => 'not_analyzed',
+ 'include_in_all' => false),
+ 'digitalObject' => array(
+ 'type' => 'object',
+ 'properties' => array(
+ 'mediaTypeId' => array(
+ 'type' => 'integer',
+ 'index' => 'not_analyzed',
+ 'include_in_all' => false),
+ 'thumbnail_FullPath' => array(
+ 'type' => 'string',
+ 'index' => 'no'))),
+ 'dates' => array(
+ 'type' => 'object',
+ 'properties' => array(
+ 'startDate' => array(
+ 'type' => 'integer',
+ 'index' => 'not_analyzed'),
+ 'endDate' => array(
+ 'type' => 'integer',
+ 'index' => 'not_analyzed'),
+ 'typeId' => array(
+ 'type' => 'string',
+ 'index' => 'not_analyzed',
+ 'include_in_all' => false),
+ 'actor' => array(
+ 'type' => 'string'))),
+ 'repository' => array(
+ 'type' => 'object',
+ 'properties' => QubitMapping::getI18nProperties()),
+ 'subjects' => array(
+ 'type' => 'object',
+ 'properties' => QubitMapping::getI18nProperties()),
+ 'places' => array(
+ 'type' => 'object',
+ 'properties' => QubitMapping::getI18nProperties()),
+ 'names' => array(
+ 'type' => 'object',
+ 'properties' => QubitMapping::getI18nProperties()),
+ 'creators' => array(
+ 'type' => 'object',
+ 'properties' => QubitMapping::getI18nProperties()))
+ + self::getI18nProperties();
}
static function serialize($object)
Modified:
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitRepositoryMapping.class.php
==============================================================================
---
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitRepositoryMapping.class.php
Thu May 3 13:11:58 2012 (r11606)
+++
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitRepositoryMapping.class.php
Thu May 3 13:20:02 2012 (r11607)
@@ -29,11 +29,21 @@
{
static function getProperties()
{
- return array('slug' => array('type' => 'string', 'index' =>
'not_analyzed'),
- 'identifier' => array('type' => 'string', 'index' =>
'not_analyzed'),
- 'types' => array('type' => 'integer', 'index' =>
'not_analyzed', 'include_in_all' => false),
- 'contact' => array('type' => 'object', 'properties' =>
QubitContactInformationMapping::getProperties()),
- ) + self::getI18nProperties();
+ return array(
+ 'slug' => array(
+ 'type' => 'string',
+ 'index' => 'not_analyzed'),
+ 'identifier' => array(
+ 'type' => 'string',
+ 'index' => 'not_analyzed'),
+ 'types' => array(
+ 'type' => 'integer',
+ 'index' => 'not_analyzed',
+ 'include_in_all' => false),
+ 'contact' => array(
+ 'type' => 'object',
+ 'properties' => QubitContactInformationMapping::getProperties()))
+ + self::getI18nProperties();
}
static function serialize($object)
Modified:
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitTermMapping.class.php
==============================================================================
---
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitTermMapping.class.php
Thu May 3 13:11:58 2012 (r11606)
+++
branches/2.0/plugins/qtElasticSearchPlugin/lib/model/QubitTermMapping.class.php
Thu May 3 13:20:02 2012 (r11607)
@@ -29,9 +29,15 @@
{
static function getProperties()
{
- return array('slug' => array('type' => 'string', 'index' =>
'not_analyzed'),
- 'taxonomyId' => array('type' => 'integer', 'index' =>
'not_analyzed', 'include_in_all' => false),
- ) + self::getI18nProperties();
+ return array(
+ 'slug' => array(
+ 'type' => 'string',
+ 'index' => 'not_analyzed'),
+ 'taxonomyId' => array(
+ 'type' => 'integer',
+ 'index' => 'not_analyzed',
+ 'include_in_all' => false))
+ + self::getI18nProperties();
}
static function serialize($object)
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
