Author: david
Date: Mon Nov 14 14:40:18 2011
New Revision: 10316
Log:
Merge all getReferenceCode() methods to a single script, to avoid duplication
Modified:
trunk/lib/model/QubitInformationObject.php
trunk/plugins/sfDcPlugin/lib/sfDcPlugin.class.php
trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
trunk/plugins/sfModsPlugin/lib/sfModsPlugin.class.php
trunk/plugins/sfRadPlugin/lib/sfRadPlugin.class.php
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Mon Nov 14 13:37:12 2011
(r10315)
+++ trunk/lib/model/QubitInformationObject.php Mon Nov 14 14:40:18 2011
(r10316)
@@ -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: trunk/plugins/sfDcPlugin/lib/sfDcPlugin.class.php
==============================================================================
--- trunk/plugins/sfDcPlugin/lib/sfDcPlugin.class.php Mon Nov 14 13:37:12
2011 (r10315)
+++ trunk/plugins/sfDcPlugin/lib/sfDcPlugin.class.php Mon Nov 14 14:40:18
2011 (r10316)
@@ -155,9 +155,8 @@
return $format;
case 'identifier':
- $isad = new sfIsadPlugin($this->resource);
- return $isad->referenceCode;
+ return $this->resource->referenceCode;
case 'sourceCulture':
Modified: trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
==============================================================================
--- trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Mon Nov 14
13:37:12 2011 (r10315)
+++ trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Mon Nov 14
14:40:18 2011 (r10316)
@@ -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: trunk/plugins/sfModsPlugin/lib/sfModsPlugin.class.php
==============================================================================
--- trunk/plugins/sfModsPlugin/lib/sfModsPlugin.class.php Mon Nov 14
13:37:12 2011 (r10315)
+++ trunk/plugins/sfModsPlugin/lib/sfModsPlugin.class.php Mon Nov 14
14:40:18 2011 (r10316)
@@ -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: trunk/plugins/sfRadPlugin/lib/sfRadPlugin.class.php
==============================================================================
--- trunk/plugins/sfRadPlugin/lib/sfRadPlugin.class.php Mon Nov 14 13:37:12
2011 (r10315)
+++ trunk/plugins/sfRadPlugin/lib/sfRadPlugin.class.php Mon Nov 14 14:40:18
2011 (r10316)
@@ -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':
--
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.
