Author: david
Date: Mon Nov 14 15:28:27 2011
New Revision: 10319
Log:
Merge -r10315:10318 from trunk
Modified:
branches/dcb/ (props changed)
branches/dcb/images/logo.png (props changed)
branches/dcb/lib/QubitSearch.class.php
branches/dcb/lib/model/QubitInformationObject.php
branches/dcb/plugins/qbAclPlugin/lib/vendor/Zend/ (props changed)
branches/dcb/plugins/sfDcPlugin/lib/sfDcPlugin.class.php
branches/dcb/plugins/sfDrupalPlugin/vendor/drupal/ (props changed)
branches/dcb/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
branches/dcb/plugins/sfModsPlugin/lib/sfModsPlugin.class.php
branches/dcb/plugins/sfRadPlugin/lib/sfRadPlugin.class.php
branches/dcb/plugins/sfSearchPlugin/lib/task/xfPopulateTask.class.php
branches/dcb/vendor/symfony/ (props changed)
branches/dcb/vendor/symfony/lib/task/i18n/sfI18nExtractPluginTask.class.php
(props changed)
branches/dcb/vendor/yui/ (props changed)
branches/ica-atom/ (props changed)
branches/ica-atom/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
(props changed)
branches/ica-atom/favicon.ico (props changed)
branches/ica-atom/images/logo.png (props changed)
branches/ica-atom/lib/QubitSearch.class.php
branches/ica-atom/lib/model/QubitInformationObject.php
branches/ica-atom/plugins/qbAclPlugin/lib/vendor/Zend/ (props changed)
branches/ica-atom/plugins/sfDcPlugin/lib/sfDcPlugin.class.php
branches/ica-atom/plugins/sfDrupalPlugin/vendor/drupal/ (props changed)
branches/ica-atom/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
branches/ica-atom/plugins/sfModsPlugin/lib/sfModsPlugin.class.php
branches/ica-atom/plugins/sfRadPlugin/lib/sfRadPlugin.class.php
branches/ica-atom/plugins/sfSearchPlugin/lib/task/xfPopulateTask.class.php
branches/ica-atom/vendor/symfony/ (props changed)
branches/ica-atom/vendor/symfony/lib/task/i18n/sfI18nExtractPluginTask.class.php
(props changed)
branches/ica-atom/vendor/yui/ (props changed)
Modified: branches/dcb/lib/QubitSearch.class.php
==============================================================================
--- branches/dcb/lib/QubitSearch.class.php Mon Nov 14 15:16:01 2011
(r10318)
+++ branches/dcb/lib/QubitSearch.class.php Mon Nov 14 15:28:27 2011
(r10319)
@@ -461,8 +461,7 @@
$doc->addField(Zend_Search_Lucene_Field::Text('scopeAndContent',
$informationObject->getScopeAndContent(array('culture' => $language))));
- $isad = new sfIsadPlugin($informationObject);
- $doc->addField(Zend_Search_Lucene_Field::Text('referenceCode',
$isad->referenceCode));
+ $doc->addField(Zend_Search_Lucene_Field::Text('referenceCode',
$informationObject->referenceCode));
// Store dates as serialized array
$dates = array();
Modified: branches/dcb/lib/model/QubitInformationObject.php
==============================================================================
--- branches/dcb/lib/model/QubitInformationObject.php Mon Nov 14 15:16:01
2011 (r10318)
+++ branches/dcb/lib/model/QubitInformationObject.php Mon Nov 14 15:28:27
2011 (r10319)
@@ -86,6 +86,50 @@
return array();
+ case 'referenceCode':
+
+ if (sfConfig::get('app_inherit_code_informationobject'))
+ {
+ if (!isset($this->identifier))
+ {
+ return;
+ }
+
+ $identifier = array();
+ $repository = null;
+ foreach ($this->ancestors->andSelf()->orderBy('lft') as $item)
+ {
+ if (isset($item->identifier))
+ {
+ $identifier[] = $item->identifier;
+ }
+
+ if (isset($item->repository))
+ {
+ $repository = $item->repository;
+ }
+ }
+ $identifier = implode(sfConfig::get('app_separator_character', '-'),
$identifier);
+
+ if (isset($repository->identifier))
+ {
+ $identifier = "$repository->identifier $identifier";
+ }
+
+ if (isset($repository))
+ {
+ $countryCode = $repository->getCountryCode();
+ if (isset($countryCode))
+ {
+ $identifier = "$countryCode $identifier";
+ }
+ }
+
+ return $identifier;
+ }
+
+ return $this->identifier;
+
default:
return call_user_func_array(array($this,
'BaseInformationObject::__get'), $args);
Modified: branches/dcb/plugins/sfDcPlugin/lib/sfDcPlugin.class.php
==============================================================================
--- branches/dcb/plugins/sfDcPlugin/lib/sfDcPlugin.class.php Mon Nov 14
15:16:01 2011 (r10318)
+++ branches/dcb/plugins/sfDcPlugin/lib/sfDcPlugin.class.php Mon Nov 14
15:28:27 2011 (r10319)
@@ -155,9 +155,8 @@
return $format;
case 'identifier':
- $isad = new sfIsadPlugin($this->resource);
- return $isad->referenceCode;
+ return $this->resource->referenceCode;
case 'sourceCulture':
Modified: branches/dcb/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
==============================================================================
--- branches/dcb/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Mon Nov
14 15:16:01 2011 (r10318)
+++ branches/dcb/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Mon Nov
14 15:28:27 2011 (r10319)
@@ -92,47 +92,7 @@
{
case 'referenceCode':
- if (sfConfig::get('app_inherit_code_informationobject'))
- {
- if (!isset($this->resource->identifier))
- {
- return;
- }
-
- $identifier = array();
- $repository = null;
- foreach ($this->resource->ancestors->andSelf()->orderBy('lft') as
$item)
- {
- if (isset($item->identifier))
- {
- $identifier[] = $item->identifier;
- }
-
- if (isset($item->repository))
- {
- $repository = $item->repository;
- }
- }
- $identifier = implode(sfConfig::get('app_separator_character', '-'),
$identifier);
-
- if (isset($repository->identifier))
- {
- $identifier = "$repository->identifier $identifier";
- }
-
- if (isset($repository))
- {
- $countryCode = $repository->getCountryCode();
- if (isset($countryCode))
- {
- $identifier = "$countryCode $identifier";
- }
- }
-
- return $identifier;
- }
-
- return $this->resource->identifier;
+ return $this->resource->referenceCode;
case 'sourceCulture':
Modified: branches/dcb/plugins/sfModsPlugin/lib/sfModsPlugin.class.php
==============================================================================
--- branches/dcb/plugins/sfModsPlugin/lib/sfModsPlugin.class.php Mon Nov
14 15:16:01 2011 (r10318)
+++ branches/dcb/plugins/sfModsPlugin/lib/sfModsPlugin.class.php Mon Nov
14 15:28:27 2011 (r10319)
@@ -90,9 +90,8 @@
switch ($name)
{
case 'identifier':
- $isad = new sfIsadPlugin($this->resource);
- return $isad->referenceCode;
+ return $this->resource->referenceCode;
case 'name':
$name = array();
Modified: branches/dcb/plugins/sfRadPlugin/lib/sfRadPlugin.class.php
==============================================================================
--- branches/dcb/plugins/sfRadPlugin/lib/sfRadPlugin.class.php Mon Nov 14
15:16:01 2011 (r10318)
+++ branches/dcb/plugins/sfRadPlugin/lib/sfRadPlugin.class.php Mon Nov 14
15:28:27 2011 (r10319)
@@ -134,35 +134,7 @@
case 'referenceCode':
- if (sfConfig::get('app_inherit_code_informationobject'))
- {
- $countryCode = null;
- $repositoryCode = null;
- $identifier = array();
- foreach ($this->resource->ancestors->andSelf()->orderBy('lft') as
$item)
- {
- if (isset($item->repository))
- {
- $countryCode = $item->repository->getCountryCode();
- if (isset($countryCode))
- {
- $countryCode .= ' ';
- }
-
- $repositoryCode = "{$item->repository->identifier} ";
- }
-
- if (isset($item->identifier))
- {
- $identifier[] = $item->identifier;
- }
- }
- $identifier = implode(sfConfig::get('app_separator_character', '-'),
$identifier);
-
- return "$countryCode$repositoryCode$identifier";
- }
-
- return $this->resource->identifier;
+ return $this->resource->referenceCode;
case 'sourceCulture':
Modified: branches/dcb/plugins/sfSearchPlugin/lib/task/xfPopulateTask.class.php
==============================================================================
--- branches/dcb/plugins/sfSearchPlugin/lib/task/xfPopulateTask.class.php
Mon Nov 14 15:16:01 2011 (r10318)
+++ branches/dcb/plugins/sfSearchPlugin/lib/task/xfPopulateTask.class.php
Mon Nov 14 15:28:27 2011 (r10319)
@@ -26,6 +26,7 @@
$this->addOptions(array(
new sfCommandOption('application', null,
sfCommandOption::PARAMETER_OPTIONAL, 'The application name', 'qubit'),
+ new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED,
'The environment', 'cli'),
// new sfCommandOption('optimize', 'o', sfCommandOption::PARAMETER_NONE,
'If passed, the index is optimized after population'),
new sfCommandOption('actorOffset', null,
sfCommandOption::PARAMETER_REQUIRED, 'Segmentation fault workaround (actors)'),
new sfCommandOption('ioOffset', null,
sfCommandOption::PARAMETER_REQUIRED, 'Segmentation fault workaround
(information objects)')));
Modified: branches/ica-atom/lib/QubitSearch.class.php
==============================================================================
--- branches/ica-atom/lib/QubitSearch.class.php Mon Nov 14 15:16:01 2011
(r10318)
+++ branches/ica-atom/lib/QubitSearch.class.php Mon Nov 14 15:28:27 2011
(r10319)
@@ -461,8 +461,7 @@
$doc->addField(Zend_Search_Lucene_Field::Text('scopeAndContent',
$informationObject->getScopeAndContent(array('culture' => $language))));
- $isad = new sfIsadPlugin($informationObject);
- $doc->addField(Zend_Search_Lucene_Field::Text('referenceCode',
$isad->referenceCode));
+ $doc->addField(Zend_Search_Lucene_Field::Text('referenceCode',
$informationObject->referenceCode));
// Store dates as serialized array
$dates = array();
Modified: branches/ica-atom/lib/model/QubitInformationObject.php
==============================================================================
--- branches/ica-atom/lib/model/QubitInformationObject.php Mon Nov 14
15:16:01 2011 (r10318)
+++ branches/ica-atom/lib/model/QubitInformationObject.php Mon Nov 14
15:28:27 2011 (r10319)
@@ -86,6 +86,50 @@
return array();
+ case 'referenceCode':
+
+ if (sfConfig::get('app_inherit_code_informationobject'))
+ {
+ if (!isset($this->identifier))
+ {
+ return;
+ }
+
+ $identifier = array();
+ $repository = null;
+ foreach ($this->ancestors->andSelf()->orderBy('lft') as $item)
+ {
+ if (isset($item->identifier))
+ {
+ $identifier[] = $item->identifier;
+ }
+
+ if (isset($item->repository))
+ {
+ $repository = $item->repository;
+ }
+ }
+ $identifier = implode(sfConfig::get('app_separator_character', '-'),
$identifier);
+
+ if (isset($repository->identifier))
+ {
+ $identifier = "$repository->identifier $identifier";
+ }
+
+ if (isset($repository))
+ {
+ $countryCode = $repository->getCountryCode();
+ if (isset($countryCode))
+ {
+ $identifier = "$countryCode $identifier";
+ }
+ }
+
+ return $identifier;
+ }
+
+ return $this->identifier;
+
default:
return call_user_func_array(array($this,
'BaseInformationObject::__get'), $args);
Modified: branches/ica-atom/plugins/sfDcPlugin/lib/sfDcPlugin.class.php
==============================================================================
--- branches/ica-atom/plugins/sfDcPlugin/lib/sfDcPlugin.class.php Mon Nov
14 15:16:01 2011 (r10318)
+++ branches/ica-atom/plugins/sfDcPlugin/lib/sfDcPlugin.class.php Mon Nov
14 15:28:27 2011 (r10319)
@@ -155,9 +155,8 @@
return $format;
case 'identifier':
- $isad = new sfIsadPlugin($this->resource);
- return $isad->referenceCode;
+ return $this->resource->referenceCode;
case 'sourceCulture':
Modified: branches/ica-atom/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
==============================================================================
--- branches/ica-atom/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Mon Nov
14 15:16:01 2011 (r10318)
+++ branches/ica-atom/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Mon Nov
14 15:28:27 2011 (r10319)
@@ -92,47 +92,7 @@
{
case 'referenceCode':
- if (sfConfig::get('app_inherit_code_informationobject'))
- {
- if (!isset($this->resource->identifier))
- {
- return;
- }
-
- $identifier = array();
- $repository = null;
- foreach ($this->resource->ancestors->andSelf()->orderBy('lft') as
$item)
- {
- if (isset($item->identifier))
- {
- $identifier[] = $item->identifier;
- }
-
- if (isset($item->repository))
- {
- $repository = $item->repository;
- }
- }
- $identifier = implode(sfConfig::get('app_separator_character', '-'),
$identifier);
-
- if (isset($repository->identifier))
- {
- $identifier = "$repository->identifier $identifier";
- }
-
- if (isset($repository))
- {
- $countryCode = $repository->getCountryCode();
- if (isset($countryCode))
- {
- $identifier = "$countryCode $identifier";
- }
- }
-
- return $identifier;
- }
-
- return $this->resource->identifier;
+ return $this->resource->referenceCode;
case 'sourceCulture':
Modified: branches/ica-atom/plugins/sfModsPlugin/lib/sfModsPlugin.class.php
==============================================================================
--- branches/ica-atom/plugins/sfModsPlugin/lib/sfModsPlugin.class.php Mon Nov
14 15:16:01 2011 (r10318)
+++ branches/ica-atom/plugins/sfModsPlugin/lib/sfModsPlugin.class.php Mon Nov
14 15:28:27 2011 (r10319)
@@ -90,9 +90,8 @@
switch ($name)
{
case 'identifier':
- $isad = new sfIsadPlugin($this->resource);
- return $isad->referenceCode;
+ return $this->resource->referenceCode;
case 'name':
$name = array();
Modified: branches/ica-atom/plugins/sfRadPlugin/lib/sfRadPlugin.class.php
==============================================================================
--- branches/ica-atom/plugins/sfRadPlugin/lib/sfRadPlugin.class.php Mon Nov
14 15:16:01 2011 (r10318)
+++ branches/ica-atom/plugins/sfRadPlugin/lib/sfRadPlugin.class.php Mon Nov
14 15:28:27 2011 (r10319)
@@ -134,35 +134,7 @@
case 'referenceCode':
- if (sfConfig::get('app_inherit_code_informationobject'))
- {
- $countryCode = null;
- $repositoryCode = null;
- $identifier = array();
- foreach ($this->resource->ancestors->andSelf()->orderBy('lft') as
$item)
- {
- if (isset($item->repository))
- {
- $countryCode = $item->repository->getCountryCode();
- if (isset($countryCode))
- {
- $countryCode .= ' ';
- }
-
- $repositoryCode = "{$item->repository->identifier} ";
- }
-
- if (isset($item->identifier))
- {
- $identifier[] = $item->identifier;
- }
- }
- $identifier = implode(sfConfig::get('app_separator_character', '-'),
$identifier);
-
- return "$countryCode$repositoryCode$identifier";
- }
-
- return $this->resource->identifier;
+ return $this->resource->referenceCode;
case 'sourceCulture':
Modified:
branches/ica-atom/plugins/sfSearchPlugin/lib/task/xfPopulateTask.class.php
==============================================================================
--- branches/ica-atom/plugins/sfSearchPlugin/lib/task/xfPopulateTask.class.php
Mon Nov 14 15:16:01 2011 (r10318)
+++ branches/ica-atom/plugins/sfSearchPlugin/lib/task/xfPopulateTask.class.php
Mon Nov 14 15:28:27 2011 (r10319)
@@ -26,6 +26,7 @@
$this->addOptions(array(
new sfCommandOption('application', null,
sfCommandOption::PARAMETER_OPTIONAL, 'The application name', 'qubit'),
+ new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED,
'The environment', 'cli'),
// new sfCommandOption('optimize', 'o', sfCommandOption::PARAMETER_NONE,
'If passed, the index is optimized after population'),
new sfCommandOption('actorOffset', null,
sfCommandOption::PARAMETER_REQUIRED, 'Segmentation fault workaround (actors)'),
new sfCommandOption('ioOffset', null,
sfCommandOption::PARAMETER_REQUIRED, 'Segmentation fault workaround
(information objects)')));
--
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.
