Author: jablko
Date: Sun Oct 24 12:12:01 2010
New Revision: 8419
Log:
Cosmetic change, for consistency
Modified:
trunk/apps/qubit/modules/digitalobject/actions/editAction.class.php
trunk/apps/qubit/modules/digitalobject/actions/showCompoundComponent.class.php
trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/function/actions/listAction.class.php
trunk/apps/qubit/modules/oai/actions/identifyComponent.class.php
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/user/actions/editAction.class.php
trunk/lib/model/QubitActor.php
trunk/lib/model/QubitDigitalObject.php
trunk/lib/model/QubitInformationObject.php
trunk/lib/model/QubitMenu.php
trunk/lib/model/QubitObjectTermRelation.php
trunk/lib/model/QubitRelation.php
trunk/lib/model/QubitSetting.php
trunk/lib/model/QubitTaxonomy.php
trunk/lib/model/QubitTerm.php
trunk/lib/model/QubitUser.php
trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
Modified: trunk/apps/qubit/modules/digitalobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/editAction.class.php Sun Oct
24 12:09:00 2010 (r8418)
+++ trunk/apps/qubit/modules/digitalobject/actions/editAction.class.php Sun Oct
24 12:12:01 2010 (r8419)
@@ -32,7 +32,7 @@
// Media type field
$choices = $validChoices = array();
$c = new Criteria;
- $c->add(QubitTerm::TAXONOMY_ID, QubitTaxonomy::MEDIA_TYPE_ID,
Criteria::EQUAL);
+ $c->add(QubitTerm::TAXONOMY_ID, QubitTaxonomy::MEDIA_TYPE_ID);
if (null !== ($mediaTypeTerms = QubitTerm::get($c)))
{
foreach ($mediaTypeTerms as $mediaTypeTerm)
@@ -70,8 +70,8 @@
));
// Set "displayAsCompound" value from QubitProperty
$c = new Criteria;
- $c->add(QubitProperty::OBJECT_ID, $this->digitalObject->id,
Criteria::EQUAL);
- $c->add(QubitProperty::NAME, 'displayAsCompound', Criteria::EQUAL);
+ $c->add(QubitProperty::OBJECT_ID, $this->digitalObject->id);
+ $c->add(QubitProperty::NAME, 'displayAsCompound');
if (null != ($compoundProperty = QubitProperty::getOne($c)))
{
Modified:
trunk/apps/qubit/modules/digitalobject/actions/showCompoundComponent.class.php
==============================================================================
---
trunk/apps/qubit/modules/digitalobject/actions/showCompoundComponent.class.php
Sun Oct 24 12:09:00 2010 (r8418)
+++
trunk/apps/qubit/modules/digitalobject/actions/showCompoundComponent.class.php
Sun Oct 24 12:12:01 2010 (r8419)
@@ -36,7 +36,7 @@
{
// Find all digital objects of child information objects
$criteria = new Criteria;
- $criteria->add(QubitInformationObject::PARENT_ID,
$this->digitalObject->informationObject->id, Criteria::EQUAL);
+ $criteria->add(QubitInformationObject::PARENT_ID,
$this->digitalObject->informationObject->id);
$criteria->addJoin(QubitInformationObject::ID,
QubitDigitalObject::INFORMATION_OBJECT_ID);
// Show two results on page with pager
Modified: trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
Sun Oct 24 12:09:00 2010 (r8418)
+++ trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
Sun Oct 24 12:12:01 2010 (r8419)
@@ -42,7 +42,7 @@
{
$criteria->add(QubitFunctionI18n::AUTHORIZED_FORM_OF_NAME,
$request->query.'%', Criteria::LIKE);
}
- $criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture(), Criteria::EQUAL);
+ $criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture());
// Exclude the calling function from the list
$params =
$this->context->routing->parse(Qubit::pathInfo($request->getReferer()));
Modified: trunk/apps/qubit/modules/function/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/listAction.class.php Sun Oct
24 12:09:00 2010 (r8418)
+++ trunk/apps/qubit/modules/function/actions/listAction.class.php Sun Oct
24 12:12:01 2010 (r8419)
@@ -42,7 +42,7 @@
{
$criteria->addJoin(QubitFunction::ID, QubitFunctionI18n::ID,
Criteria::INNER_JOIN);
$criteria->add(QubitFunctionI18n::AUTHORIZED_FORM_OF_NAME,
'%'.$request->subquery.'%', Criteria::LIKE);
- $criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture(), Criteria::EQUAL);
+ $criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture());
}
// Page results
Modified: trunk/apps/qubit/modules/oai/actions/identifyComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/identifyComponent.class.php Sun Oct
24 12:09:00 2010 (r8418)
+++ trunk/apps/qubit/modules/oai/actions/identifyComponent.class.php Sun Oct
24 12:12:01 2010 (r8419)
@@ -51,7 +51,7 @@
}
$criteria = new Criteria;
- $criteria->add(QubitAclUserGroup::GROUP_ID,
QubitAclGroup::ADMINISTRATOR_ID, Criteria::EQUAL);
+ $criteria->add(QubitAclUserGroup::GROUP_ID,
QubitAclGroup::ADMINISTRATOR_ID);
$criteria->addJoin(QubitAclUserGroup::USER_ID, QubitUser::ID);
$users = QubitUser::get($criteria);
$this->adminEmail = array();
Modified:
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
Sun Oct 24 12:09:00 2010 (r8418)
+++
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
Sun Oct 24 12:12:01 2010 (r8419)
@@ -34,7 +34,7 @@
$criteria = new Criteria;
$criteria->addJoin(QubitPhysicalObject::ID, QubitPhysicalObjectI18n::ID,
Criteria::INNER_JOIN);
- $criteria->add(QubitPhysicalObjectI18n::CULTURE,
$this->context->user->getCulture(), Criteria::EQUAL);
+ $criteria->add(QubitPhysicalObjectI18n::CULTURE,
$this->context->user->getCulture());
$criteria->add(QubitPhysicalObjectI18n::NAME, $request->query.'%',
Criteria::LIKE);
$criteria->addAscendingOrderByColumn(QubitPhysicalObjectI18n::NAME);
Modified: trunk/apps/qubit/modules/user/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/editAction.class.php Sun Oct 24
12:09:00 2010 (r8418)
+++ trunk/apps/qubit/modules/user/actions/editAction.class.php Sun Oct 24
12:12:01 2010 (r8419)
@@ -58,7 +58,7 @@
case 'groups':
$values = array();
$criteria = new Criteria;
- $criteria->add(QubitAclUserGroup::USER_ID, $this->user->id,
Criteria::EQUAL);
+ $criteria->add(QubitAclUserGroup::USER_ID, $this->user->id);
foreach (QubitAclUserGroup::get($criteria) as $userGroup)
{
$values[] = $userGroup->groupId;
Modified: trunk/lib/model/QubitActor.php
==============================================================================
--- trunk/lib/model/QubitActor.php Sun Oct 24 12:09:00 2010 (r8418)
+++ trunk/lib/model/QubitActor.php Sun Oct 24 12:12:01 2010 (r8419)
@@ -448,9 +448,9 @@
$criteria->addJoin(QubitRelation::TYPE_ID, QubitTerm::ID,
Criteria::INNER_JOIN);
- $criterion1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID,
$this->getId(), Criteria::EQUAL);
- $criterion2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID,
$this->getId(), Criteria::EQUAL);
- $criterion3 = $criteria->getNewCriterion(QubitTerm::TAXONOMY_ID,
QubitTaxonomy::ACTOR_RELATION_TYPE_ID, Criteria::EQUAL);
+ $criterion1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID,
$this->getId());
+ $criterion2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID,
$this->getId());
+ $criterion3 = $criteria->getNewCriterion(QubitTerm::TAXONOMY_ID,
QubitTaxonomy::ACTOR_RELATION_TYPE_ID);
$criterion1->addOr($criterion2);
$criterion1->addAnd($criterion3);
$criteria->add($criterion1);
@@ -472,11 +472,11 @@
{
$criteria = new Criteria();
$criteria->addJoin(QubitActor::ID, QubitActorI18n::ID,
Criteria::INNER_JOIN);
- $criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME, $name,
Criteria::EQUAL);
+ $criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME, $name);
if (isset($options['culture']))
{
- $criteria->addAnd(QubitActorI18n::CULTURE, $options['culture'],
Criteria::EQUAL);
+ $criteria->addAnd(QubitActorI18n::CULTURE, $options['culture']);
}
return QubitActor::getOne($criteria, $options);
Modified: trunk/lib/model/QubitDigitalObject.php
==============================================================================
--- trunk/lib/model/QubitDigitalObject.php Sun Oct 24 12:09:00 2010
(r8418)
+++ trunk/lib/model/QubitDigitalObject.php Sun Oct 24 12:12:01 2010
(r8419)
@@ -987,7 +987,7 @@
public function getPage($index)
{
$criteria = new Criteria;
- $criteria->add(QubitInformationObject::PARENT_ID,
$this->informationObject->id, Criteria::EQUAL);
+ $criteria->add(QubitInformationObject::PARENT_ID,
$this->informationObject->id);
$criteria->addJoin(QubitInformationObject::ID,
QubitDigitalObject::INFORMATION_OBJECT_ID);
$criteria->setLimit(1);
$criteria->setOffset($index);
@@ -1825,7 +1825,7 @@
public function setDisplayAsCompoundObject($value)
{
$criteria = new Criteria;
- $criteria->add(QubitProperty::OBJECT_ID, $this->id, Criteria::EQUAL);
+ $criteria->add(QubitProperty::OBJECT_ID, $this->id);
$criteria->add(QubitProperty::NAME, 'displayAsCompound');
$displayAsCompoundProp = QubitProperty::getOne($criteria);
@@ -1884,7 +1884,7 @@
// Return false if this object has no children with digital objects
$criteria = new Criteria;
$criteria->addJoin(QubitInformationObject::ID,
QubitDigitalObject::INFORMATION_OBJECT_ID, Criteria::INNER_JOIN);
- $criteria->add(QubitInformationObject::PARENT_ID,
$this->informationObjectId, Criteria::EQUAL);
+ $criteria->add(QubitInformationObject::PARENT_ID,
$this->informationObjectId);
if (0 === count(QubitDigitalObject::get($criteria)))
{
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Sun Oct 24 12:09:00 2010
(r8418)
+++ trunk/lib/model/QubitInformationObject.php Sun Oct 24 12:12:01 2010
(r8419)
@@ -368,7 +368,7 @@
public function getChildren($options = array())
{
$c = new Criteria;
- $c->add(QubitInformationObject::PARENT_ID, $this->id, Criteria::EQUAL);
+ $c->add(QubitInformationObject::PARENT_ID, $this->id);
$sortBy = (isset($options['sortBy'])) ? $options['sortBy'] : 'lft';
@@ -407,7 +407,7 @@
// For a node with no children: rgt = (lft+1); therefore search for nodes
// with: rgt > (lft+1)
$criteria->add(QubitInformationObject::RGT, QubitInformationObject::RGT.'
> ('.QubitInformationObject::LFT.' + 1)', Criteria::CUSTOM);
- $criteria->add('parent.lft', 1, Criteria::EQUAL);
+ $criteria->add('parent.lft', 1);
return QubitInformationObject::get($criteria);
}
@@ -1496,7 +1496,7 @@
{
$criteria = new Criteria;
$criteria->addJoin(QubitInformationObject::ID,
QubitInformationObjectI18n::ID, Criteria::INNER_JOIN);
- $criteria->add(QubitInformationObjectI18n::CULTURE, $culture,
Criteria::EQUAL);
+ $criteria->add(QubitInformationObjectI18n::CULTURE, $culture);
return QubitInformationObject::get($criteria, $options);
}
Modified: trunk/lib/model/QubitMenu.php
==============================================================================
--- trunk/lib/model/QubitMenu.php Sun Oct 24 12:09:00 2010 (r8418)
+++ trunk/lib/model/QubitMenu.php Sun Oct 24 12:12:01 2010 (r8419)
@@ -119,7 +119,7 @@
public static function getByName($menuName, $options = array())
{
$criteria = new Criteria;
- $criteria->add(QubitMenu::NAME, $menuName, Criteria::EQUAL);
+ $criteria->add(QubitMenu::NAME, $menuName);
return QubitMenu::getOne($criteria);
}
@@ -234,7 +234,7 @@
public function getChildren()
{
$c = new Criteria;
- $c->add(QubitMenu::PARENT_ID, $this->getId(), Criteria::EQUAL);
+ $c->add(QubitMenu::PARENT_ID, $this->getId());
$c->addAscendingOrderByColumn(QubitMenu::LFT);
return QubitMenu::get($c);
@@ -333,7 +333,7 @@
$parent = $this->getParent();
$criteria = new Criteria;
- $criteria->add(QubitMenu::ID, $referenceMenuId, Criteria::EQUAL);
+ $criteria->add(QubitMenu::ID, $referenceMenuId);
$criteria->addAnd(QubitMenu::LFT, $parent->getLft(),
Criteria::GREATER_THAN);
$criteria->addAnd(QubitMenu::RGT, $parent->getRgt(), Criteria::LESS_THAN);
@@ -360,7 +360,7 @@
$parent = $this->getParent();
$criteria = new Criteria;
- $criteria->add(QubitMenu::ID, $referenceMenuId, Criteria::EQUAL);
+ $criteria->add(QubitMenu::ID, $referenceMenuId);
$criteria->addAnd(QubitMenu::LFT, $parent->getLft(),
Criteria::GREATER_THAN);
$criteria->addAnd(QubitMenu::RGT, $parent->getRgt(), Criteria::LESS_THAN);
Modified: trunk/lib/model/QubitObjectTermRelation.php
==============================================================================
--- trunk/lib/model/QubitObjectTermRelation.php Sun Oct 24 12:09:00 2010
(r8418)
+++ trunk/lib/model/QubitObjectTermRelation.php Sun Oct 24 12:12:01 2010
(r8419)
@@ -94,7 +94,7 @@
public static function getOneByObjectId($objectId)
{
$c = new Criteria;
- $c->add(QubitObjectTermRelation::OBJECT_ID, $objectId, Criteria::EQUAL);
+ $c->add(QubitObjectTermRelation::OBJECT_ID, $objectId);
return QubitObjectTermRelation::getOne($c);
}
Modified: trunk/lib/model/QubitRelation.php
==============================================================================
--- trunk/lib/model/QubitRelation.php Sun Oct 24 12:09:00 2010 (r8418)
+++ trunk/lib/model/QubitRelation.php Sun Oct 24 12:12:01 2010 (r8419)
@@ -181,14 +181,14 @@
{
$criteria = new Criteria;
- $criterion1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID, $id,
Criteria::EQUAL);
- $criterion2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID, $id,
Criteria::EQUAL);
+ $criterion1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID, $id);
+ $criterion2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID, $id);
$criterion1->addOr($criterion2);
// If restricting by relation type
if (isset($options['typeId']))
{
- $criterion3 = $criteria->getNewCriterion(QubitRelation::TYPE_ID,
$options['typeId'], Criteria::EQUAL);
+ $criterion3 = $criteria->getNewCriterion(QubitRelation::TYPE_ID,
$options['typeId']);
$criterion1->addAnd($criterion3);
}
@@ -348,8 +348,8 @@
public function getNoteByTypeId($noteTypeId)
{
$criteria = new Criteria;
- $criteria->add(QubitNote::OBJECT_ID, $this->getId(), Criteria::EQUAL);
- $criteria->add(QubitNote::TYPE_ID, $noteTypeId, Criteria::EQUAL);
+ $criteria->add(QubitNote::OBJECT_ID, $this->getId());
+ $criteria->add(QubitNote::TYPE_ID, $noteTypeId);
return QubitNote::getOne($criteria);
}
Modified: trunk/lib/model/QubitSetting.php
==============================================================================
--- trunk/lib/model/QubitSetting.php Sun Oct 24 12:09:00 2010 (r8418)
+++ trunk/lib/model/QubitSetting.php Sun Oct 24 12:12:01 2010 (r8419)
@@ -119,7 +119,7 @@
$criteria = new Criteria;
if (null !== $scope)
{
- $criteria->add(QubitSetting::SCOPE, $scope, Criteria::EQUAL);
+ $criteria->add(QubitSetting::SCOPE, $scope);
}
else
{
@@ -137,7 +137,7 @@
static public function getSettingByName($name)
{
$criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, $name, Criteria::EQUAL);
+ $criteria->add(QubitSetting::NAME, $name);
return QubitSetting::getOne($criteria);
}
@@ -150,8 +150,8 @@
static public function getByNameAndScope($name, $scope)
{
$criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, $name, Criteria::EQUAL);
- $criteria->add(QubitSetting::SCOPE, $scope, Criteria::EQUAL);
+ $criteria->add(QubitSetting::NAME, $name);
+ $criteria->add(QubitSetting::SCOPE, $scope);
return QubitSetting::getOne($criteria);
}
Modified: trunk/lib/model/QubitTaxonomy.php
==============================================================================
--- trunk/lib/model/QubitTaxonomy.php Sun Oct 24 12:09:00 2010 (r8418)
+++ trunk/lib/model/QubitTaxonomy.php Sun Oct 24 12:12:01 2010 (r8419)
@@ -103,12 +103,12 @@
public static function getTaxonomyTerms($taxonomyId, $options = array())
{
$criteria = new Criteria;
- $criteria->add(QubitTerm::TAXONOMY_ID, $taxonomyId, Criteria::EQUAL);
+ $criteria->add(QubitTerm::TAXONOMY_ID, $taxonomyId);
// Only include top-level terms if option is set
if (isset($options['level']) && $options['level'] == 'top')
{
- $criteria->add(QubitTerm::PARENT_ID, QubitTerm::ROOT_ID,
Criteria::EQUAL);
+ $criteria->add(QubitTerm::PARENT_ID, QubitTerm::ROOT_ID);
}
// Sort alphabetically
Modified: trunk/lib/model/QubitTerm.php
==============================================================================
--- trunk/lib/model/QubitTerm.php Sun Oct 24 12:09:00 2010 (r8418)
+++ trunk/lib/model/QubitTerm.php Sun Oct 24 12:12:01 2010 (r8419)
@@ -246,8 +246,8 @@
// Delete relations
$criteria = new Criteria;
- $cton1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID, $this->id,
Criteria::EQUAL);
- $cton2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID, $this->id,
Criteria::EQUAL);
+ $cton1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID, $this->id);
+ $cton2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID, $this->id);
$cton1->addOr($cton2);
$criteria->add($cton1);
@@ -261,7 +261,7 @@
// Delete relation to objects
$criteria = new Criteria;
- $criteria->add(QubitObjectTermRelation::TERM_ID, $this->id,
Criteria::EQUAL);
+ $criteria->add(QubitObjectTermRelation::TERM_ID, $this->id);
if (0 < count($otRelations = QubitObjectTermRelation::get($criteria)))
{
@@ -743,7 +743,7 @@
public function getChildren($options = array())
{
$criteria = new Criteria;
- $criteria->add(QubitTerm::PARENT_ID, $this->id, Criteria::EQUAL);
+ $criteria->add(QubitTerm::PARENT_ID, $this->id);
$sortBy = (isset($options['sortBy'])) ? $options['sortBy'] : 'lft';
Modified: trunk/lib/model/QubitUser.php
==============================================================================
--- trunk/lib/model/QubitUser.php Sun Oct 24 12:09:00 2010 (r8418)
+++ trunk/lib/model/QubitUser.php Sun Oct 24 12:12:01 2010 (r8419)
@@ -148,7 +148,7 @@
}
$criteria = new Criteria;
- $criteria->add(QubitAclUserGroup::USER_ID, $this->id, Criteria::EQUAL);
+ $criteria->add(QubitAclUserGroup::USER_ID, $this->id);
if (0 < count($userGroups = QubitAclUserGroup::get($criteria)))
{
Modified: trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php Sun Oct 24 12:09:00
2010 (r8418)
+++ trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php Sun Oct 24 12:12:01
2010 (r8419)
@@ -916,7 +916,7 @@
// If object has no children include it by id
if (1 == ($resource->rgt - $resource->lft))
{
- $subCriterion =
$criteria->getNewCriterion(constant("$rootClass::ID"), $resourceId,
Criteria::EQUAL);
+ $subCriterion =
$criteria->getNewCriterion(constant("$rootClass::ID"), $resourceId);
}
// Else, include object and all children
Modified:
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
==============================================================================
---
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
Sun Oct 24 12:09:00 2010 (r8418)
+++
trunk/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/actions/relatedFunctionComponent.class.php
Sun Oct 24 12:12:01 2010 (r8419)
@@ -101,8 +101,8 @@
// Find function to function relations with current function as subject or
// object
$criteria = new Criteria;
- $criterion1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID,
$this->resource->id, Criteria::EQUAL);
- $criterion2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID,
$this->resource->id, Criteria::EQUAL);
+ $criterion1 = $criteria->getNewCriterion(QubitRelation::OBJECT_ID,
$this->resource->id);
+ $criterion2 = $criteria->getNewCriterion(QubitRelation::SUBJECT_ID,
$this->resource->id);
$criterion1->addOr($criterion2);
$criteria->add($criterion1);
$criteria->addAlias('ro', QubitFunction::TABLE_NAME);
--
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.