Author: mj
Date: Fri Nov 4 13:21:22 2011
New Revision: 10266
Log:
Rollback previous change for #2036. Use identifier instead.
Modified:
trunk/plugins/sfEadPlugin/lib/sfEadPlugin.class.php
trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
Modified: trunk/plugins/sfEadPlugin/lib/sfEadPlugin.class.php
==============================================================================
--- trunk/plugins/sfEadPlugin/lib/sfEadPlugin.class.php Fri Nov 4 13:09:10
2011 (r10265)
+++ trunk/plugins/sfEadPlugin/lib/sfEadPlugin.class.php Fri Nov 4 13:21:22
2011 (r10266)
@@ -30,14 +30,7 @@
public function __construct($resource)
{
- if ('isad' == sfConfig::get('app_default_template_informationobject'))
- {
- $this->resource = new sfIsadPlugin($resource);
- }
- else
- {
- $this->resource = $resource;
- }
+ $this->resource = $resource;
}
public function renderEadId()
@@ -64,14 +57,6 @@
$url = url_for(array($this->resource, 'module' => 'informationobject',
'sf_format' => 'xml'), $absolute = true);
- if ($this->resource instanceof sfIsadPlugin)
- {
- $identifier = $this->resource->referenceCode;
- }
- else
- {
- $identifier = $this->resource->id;
- }
- return "<eadid$countryCode$mainAgencyCode url=\"$url\"
encodinganalog=\"Identifier\">{$identifier}</eadid>";
+ return "<eadid$countryCode$mainAgencyCode url=\"$url\"
encodinganalog=\"Identifier\">{$this->resource->identifier}</eadid>";
}
}
Modified: trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
==============================================================================
--- trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Fri Nov 4
13:09:10 2011 (r10265)
+++ trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Fri Nov 4
13:21:22 2011 (r10266)
@@ -27,7 +27,7 @@
* @version svn:$Id$
*/
-class sfIsadPlugin extends QubitInformationObject implements ArrayAccess
+class sfIsadPlugin implements ArrayAccess
{
protected
$resource;
--
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.
