Author: sevein
Date: Fri Sep 16 20:18:43 2011
New Revision: 9748
Log:
try/catch DateTime construct, don't insert columnt if param() returns null
Modified:
trunk/lib/model/map/ActorTableMap.php
trunk/lib/model/map/ObjectTableMap.php
trunk/lib/model/map/TermTableMap.php
trunk/lib/model/om/BaseActor.php
trunk/lib/model/om/BaseActorI18n.php
trunk/lib/model/om/BaseContactInformation.php
trunk/lib/model/om/BaseContactInformationI18n.php
trunk/lib/model/om/BaseDigitalObject.php
trunk/lib/model/om/BaseEventI18n.php
trunk/lib/model/om/BaseFunctionI18n.php
trunk/lib/model/om/BaseInformationObject.php
trunk/lib/model/om/BaseInformationObjectI18n.php
trunk/lib/model/om/BaseKeymap.php
trunk/lib/model/om/BaseMenu.php
trunk/lib/model/om/BaseMenuI18n.php
trunk/lib/model/om/BaseNote.php
trunk/lib/model/om/BaseNoteI18n.php
trunk/lib/model/om/BaseOaiHarvest.php
trunk/lib/model/om/BaseOaiRepository.php
trunk/lib/model/om/BaseObject.php
trunk/lib/model/om/BaseOtherName.php
trunk/lib/model/om/BaseOtherNameI18n.php
trunk/lib/model/om/BasePhysicalObject.php
trunk/lib/model/om/BasePhysicalObjectI18n.php
trunk/lib/model/om/BaseProperty.php
trunk/lib/model/om/BasePropertyI18n.php
trunk/lib/model/om/BaseRelationI18n.php
trunk/lib/model/om/BaseRepositoryI18n.php
trunk/lib/model/om/BaseRightsI18n.php
trunk/lib/model/om/BaseSetting.php
trunk/lib/model/om/BaseSettingI18n.php
trunk/lib/model/om/BaseSlug.php
trunk/lib/model/om/BaseStaticPageI18n.php
trunk/lib/model/om/BaseStatus.php
trunk/lib/model/om/BaseTaxonomy.php
trunk/lib/model/om/BaseTaxonomyI18n.php
trunk/lib/model/om/BaseTerm.php
trunk/lib/model/om/BaseTermI18n.php
trunk/lib/propel/builder/QubitObjectBuilder.php
Modified: trunk/lib/model/map/ActorTableMap.php
==============================================================================
--- trunk/lib/model/map/ActorTableMap.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/map/ActorTableMap.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -60,6 +60,7 @@
$this->addRelation('termRelatedBydescriptionStatusId', 'term',
RelationMap::MANY_TO_ONE, array('description_status_id' => 'id', ), 'SET NULL',
null);
$this->addRelation('termRelatedBydescriptionDetailId', 'term',
RelationMap::MANY_TO_ONE, array('description_detail_id' => 'id', ), 'SET NULL',
null);
$this->addRelation('actorRelatedByparentId', 'actor',
RelationMap::MANY_TO_ONE, array('parent_id' => 'id', ), null, null);
+ $this->addRelation('donor', 'donor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
$this->addRelation('actorRelatedByparentId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'parent_id', ), null, null);
$this->addRelation('actorI18n', 'actorI18n', RelationMap::ONE_TO_MANY,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('contactInformation', 'contactInformation',
RelationMap::ONE_TO_MANY, array('id' => 'actor_id', ), 'CASCADE', null);
@@ -68,7 +69,6 @@
$this->addRelation('rights', 'rights', RelationMap::ONE_TO_MANY,
array('id' => 'rights_holder_id', ), 'SET NULL', null);
$this->addRelation('rightsHolder', 'rightsHolder',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('user', 'user', RelationMap::ONE_TO_ONE, array('id' =>
'id', ), 'CASCADE', null);
- $this->addRelation('donor', 'donor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
} // buildRelations()
} // ActorTableMap
Modified: trunk/lib/model/map/ObjectTableMap.php
==============================================================================
--- trunk/lib/model/map/ObjectTableMap.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/map/ObjectTableMap.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -50,6 +50,8 @@
public function buildRelations()
{
$this->addRelation('aclPermission', 'aclPermission',
RelationMap::ONE_TO_MANY, array('id' => 'object_id', ), 'CASCADE', null);
+ $this->addRelation('accession', 'accession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
+ $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('actor', 'actor', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
$this->addRelation('digitalObject', 'digitalObject',
RelationMap::ONE_TO_ONE, array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('event', 'event', RelationMap::ONE_TO_ONE, array('id'
=> 'id', ), 'CASCADE', null);
@@ -70,8 +72,6 @@
$this->addRelation('status', 'status', RelationMap::ONE_TO_MANY,
array('id' => 'object_id', ), 'CASCADE', null);
$this->addRelation('taxonomy', 'taxonomy', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('term', 'term', RelationMap::ONE_TO_ONE, array('id' =>
'id', ), 'CASCADE', null);
- $this->addRelation('accession', 'accession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
- $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
} // buildRelations()
} // ObjectTableMap
Modified: trunk/lib/model/map/TermTableMap.php
==============================================================================
--- trunk/lib/model/map/TermTableMap.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/map/TermTableMap.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -54,6 +54,11 @@
$this->addRelation('object', 'object', RelationMap::MANY_TO_ONE,
array('id' => 'id', ), 'CASCADE', null);
$this->addRelation('taxonomy', 'taxonomy', RelationMap::MANY_TO_ONE,
array('taxonomy_id' => 'id', ), 'CASCADE', null);
$this->addRelation('termRelatedByparentId', 'term',
RelationMap::MANY_TO_ONE, array('parent_id' => 'id', ), null, null);
+ $this->addRelation('accessionRelatedByacquisitionTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'acquisition_type_id', ), 'SET NULL',
null);
+ $this->addRelation('accessionRelatedByprocessingPriorityId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_priority_id', ), 'SET
NULL', null);
+ $this->addRelation('accessionRelatedByprocessingStatusId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_status_id', ), 'SET NULL',
null);
+ $this->addRelation('accessionRelatedByresourceTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'resource_type_id', ), 'SET NULL',
null);
+ $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_MANY,
array('id' => 'scope_id', ), 'SET NULL', null);
$this->addRelation('actorRelatedByentityTypeId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'entity_type_id', ), 'SET NULL', null);
$this->addRelation('actorRelatedBydescriptionStatusId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'description_status_id', ), 'SET NULL',
null);
$this->addRelation('actorRelatedBydescriptionDetailId', 'actor',
RelationMap::ONE_TO_MANY, array('id' => 'description_detail_id', ), 'SET NULL',
null);
@@ -81,11 +86,6 @@
$this->addRelation('statusRelatedBystatusId', 'status',
RelationMap::ONE_TO_MANY, array('id' => 'status_id', ), 'CASCADE', null);
$this->addRelation('termRelatedByparentId', 'term',
RelationMap::ONE_TO_MANY, array('id' => 'parent_id', ), null, null);
$this->addRelation('termI18n', 'termI18n', RelationMap::ONE_TO_MANY,
array('id' => 'id', ), 'CASCADE', null);
- $this->addRelation('accessionRelatedByacquisitionTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'acquisition_type_id', ), 'SET NULL',
null);
- $this->addRelation('accessionRelatedByprocessingPriorityId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_priority_id', ), 'SET
NULL', null);
- $this->addRelation('accessionRelatedByprocessingStatusId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'processing_status_id', ), 'SET NULL',
null);
- $this->addRelation('accessionRelatedByresourceTypeId', 'accession',
RelationMap::ONE_TO_MANY, array('id' => 'resource_type_id', ), 'SET NULL',
null);
- $this->addRelation('deaccession', 'deaccession', RelationMap::ONE_TO_MANY,
array('id' => 'scope_id', ), 'SET NULL', null);
} // buildRelations()
} // TermTableMap
Modified: trunk/lib/model/om/BaseActor.php
==============================================================================
--- trunk/lib/model/om/BaseActor.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseActor.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -410,7 +410,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
Modified: trunk/lib/model/om/BaseActorI18n.php
==============================================================================
--- trunk/lib/model/om/BaseActorI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseActorI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -398,7 +398,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -433,7 +440,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseContactInformation.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformation.php Fri Sep 16 19:16:50
2011 (r9747)
+++ trunk/lib/model/om/BaseContactInformation.php Fri Sep 16 20:18:43
2011 (r9748)
@@ -471,7 +471,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -506,7 +513,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseContactInformationI18n.php
==============================================================================
--- trunk/lib/model/om/BaseContactInformationI18n.php Fri Sep 16 19:16:50
2011 (r9747)
+++ trunk/lib/model/om/BaseContactInformationI18n.php Fri Sep 16 20:18:43
2011 (r9748)
@@ -380,7 +380,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -415,7 +422,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseDigitalObject.php
==============================================================================
--- trunk/lib/model/om/BaseDigitalObject.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseDigitalObject.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -238,7 +238,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
Modified: trunk/lib/model/om/BaseEventI18n.php
==============================================================================
--- trunk/lib/model/om/BaseEventI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseEventI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -378,7 +378,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -413,7 +420,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseFunctionI18n.php
==============================================================================
--- trunk/lib/model/om/BaseFunctionI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseFunctionI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -392,7 +392,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -427,7 +434,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseInformationObject.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObject.php Fri Sep 16 19:16:50
2011 (r9747)
+++ trunk/lib/model/om/BaseInformationObject.php Fri Sep 16 20:18:43
2011 (r9748)
@@ -394,7 +394,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
Modified: trunk/lib/model/om/BaseInformationObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BaseInformationObjectI18n.php Fri Sep 16 19:16:50
2011 (r9747)
+++ trunk/lib/model/om/BaseInformationObjectI18n.php Fri Sep 16 20:18:43
2011 (r9748)
@@ -414,7 +414,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -449,7 +456,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseKeymap.php
==============================================================================
--- trunk/lib/model/om/BaseKeymap.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseKeymap.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -377,7 +377,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -412,7 +419,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseMenu.php
==============================================================================
--- trunk/lib/model/om/BaseMenu.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseMenu.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -546,7 +546,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -583,7 +590,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseMenuI18n.php
==============================================================================
--- trunk/lib/model/om/BaseMenuI18n.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseMenuI18n.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -376,7 +376,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -411,7 +418,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseNote.php
==============================================================================
--- trunk/lib/model/om/BaseNote.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseNote.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -451,7 +451,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -486,7 +493,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseNoteI18n.php
==============================================================================
--- trunk/lib/model/om/BaseNoteI18n.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseNoteI18n.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -374,7 +374,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -409,7 +416,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseOaiHarvest.php
==============================================================================
--- trunk/lib/model/om/BaseOaiHarvest.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseOaiHarvest.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -385,7 +385,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -420,7 +427,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseOaiRepository.php
==============================================================================
--- trunk/lib/model/om/BaseOaiRepository.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseOaiRepository.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -403,7 +403,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -438,7 +445,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseObject.php
==============================================================================
--- trunk/lib/model/om/BaseObject.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseObject.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -575,7 +575,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -610,7 +617,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseOtherName.php
==============================================================================
--- trunk/lib/model/om/BaseOtherName.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseOtherName.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -451,7 +451,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -486,7 +493,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseOtherNameI18n.php
==============================================================================
--- trunk/lib/model/om/BaseOtherNameI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseOtherNameI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -378,7 +378,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -413,7 +420,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BasePhysicalObject.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObject.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BasePhysicalObject.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -334,7 +334,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
Modified: trunk/lib/model/om/BasePhysicalObjectI18n.php
==============================================================================
--- trunk/lib/model/om/BasePhysicalObjectI18n.php Fri Sep 16 19:16:50
2011 (r9747)
+++ trunk/lib/model/om/BasePhysicalObjectI18n.php Fri Sep 16 20:18:43
2011 (r9748)
@@ -378,7 +378,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -413,7 +420,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseProperty.php
==============================================================================
--- trunk/lib/model/om/BaseProperty.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseProperty.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -449,7 +449,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -484,7 +491,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BasePropertyI18n.php
==============================================================================
--- trunk/lib/model/om/BasePropertyI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BasePropertyI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -374,7 +374,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -409,7 +416,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseRelationI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRelationI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseRelationI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -376,7 +376,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -411,7 +418,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseRepositoryI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRepositoryI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseRepositoryI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -402,7 +402,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -437,7 +444,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseRightsI18n.php
==============================================================================
--- trunk/lib/model/om/BaseRightsI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseRightsI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -390,7 +390,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -425,7 +432,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseSetting.php
==============================================================================
--- trunk/lib/model/om/BaseSetting.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseSetting.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -451,7 +451,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -486,7 +493,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseSettingI18n.php
==============================================================================
--- trunk/lib/model/om/BaseSettingI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseSettingI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -374,7 +374,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -409,7 +416,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseSlug.php
==============================================================================
--- trunk/lib/model/om/BaseSlug.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseSlug.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -373,7 +373,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -408,7 +415,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseStaticPageI18n.php
==============================================================================
--- trunk/lib/model/om/BaseStaticPageI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseStaticPageI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -376,7 +376,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -411,7 +418,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseStatus.php
==============================================================================
--- trunk/lib/model/om/BaseStatus.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseStatus.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -375,7 +375,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -410,7 +417,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseTaxonomy.php
==============================================================================
--- trunk/lib/model/om/BaseTaxonomy.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseTaxonomy.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -356,7 +356,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
Modified: trunk/lib/model/om/BaseTaxonomyI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTaxonomyI18n.php Fri Sep 16 19:16:50 2011
(r9747)
+++ trunk/lib/model/om/BaseTaxonomyI18n.php Fri Sep 16 20:18:43 2011
(r9748)
@@ -376,7 +376,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -411,7 +418,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/model/om/BaseTerm.php
==============================================================================
--- trunk/lib/model/om/BaseTerm.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseTerm.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -109,6 +109,31 @@
{
}
+ if ('accessionsRelatedByacquisitionTypeId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByprocessingPriorityId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByprocessingStatusId' == $name)
+ {
+ return true;
+ }
+
+ if ('accessionsRelatedByresourceTypeId' == $name)
+ {
+ return true;
+ }
+
+ if ('deaccessions' == $name)
+ {
+ return true;
+ }
+
if ('actorsRelatedByentityTypeId' == $name)
{
return true;
@@ -244,31 +269,6 @@
return true;
}
- if ('accessionsRelatedByacquisitionTypeId' == $name)
- {
- return true;
- }
-
- if ('accessionsRelatedByprocessingPriorityId' == $name)
- {
- return true;
- }
-
- if ('accessionsRelatedByprocessingStatusId' == $name)
- {
- return true;
- }
-
- if ('accessionsRelatedByresourceTypeId' == $name)
- {
- return true;
- }
-
- if ('deaccessions' == $name)
- {
- return true;
- }
-
try
{
if (!$value =
call_user_func_array(array($this->getCurrenttermI18n($options), '__isset'),
$args) && !empty($options['cultureFallback']))
@@ -313,6 +313,91 @@
{
}
+ if ('accessionsRelatedByacquisitionTypeId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByacquisitionTypeId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
self::getaccessionsRelatedByacquisitionTypeIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByacquisitionTypeId'];
+ }
+
+ if ('accessionsRelatedByprocessingPriorityId' == $name)
+ {
+ if
(!isset($this->refFkValues['accessionsRelatedByprocessingPriorityId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
self::getaccessionsRelatedByprocessingPriorityIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByprocessingPriorityId'];
+ }
+
+ if ('accessionsRelatedByprocessingStatusId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByprocessingStatusId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
self::getaccessionsRelatedByprocessingStatusIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByprocessingStatusId'];
+ }
+
+ if ('accessionsRelatedByresourceTypeId' == $name)
+ {
+ if (!isset($this->refFkValues['accessionsRelatedByresourceTypeId']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['accessionsRelatedByresourceTypeId'] =
QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['accessionsRelatedByresourceTypeId'] =
self::getaccessionsRelatedByresourceTypeIdById($this->id, array('self' =>
$this) + $options);
+ }
+ }
+
+ return $this->refFkValues['accessionsRelatedByresourceTypeId'];
+ }
+
+ if ('deaccessions' == $name)
+ {
+ if (!isset($this->refFkValues['deaccessions']))
+ {
+ if (!isset($this->id))
+ {
+ $this->refFkValues['deaccessions'] = QubitQuery::create();
+ }
+ else
+ {
+ $this->refFkValues['deaccessions'] =
self::getdeaccessionsById($this->id, array('self' => $this) + $options);
+ }
+ }
+
+ return $this->refFkValues['deaccessions'];
+ }
+
if ('actorsRelatedByentityTypeId' == $name)
{
if (!isset($this->refFkValues['actorsRelatedByentityTypeId']))
@@ -772,91 +857,6 @@
return $this->refFkValues['termI18ns'];
}
- if ('accessionsRelatedByacquisitionTypeId' == $name)
- {
- if (!isset($this->refFkValues['accessionsRelatedByacquisitionTypeId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['accessionsRelatedByacquisitionTypeId'] =
self::getaccessionsRelatedByacquisitionTypeIdById($this->id, array('self' =>
$this) + $options);
- }
- }
-
- return $this->refFkValues['accessionsRelatedByacquisitionTypeId'];
- }
-
- if ('accessionsRelatedByprocessingPriorityId' == $name)
- {
- if
(!isset($this->refFkValues['accessionsRelatedByprocessingPriorityId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['accessionsRelatedByprocessingPriorityId'] =
self::getaccessionsRelatedByprocessingPriorityIdById($this->id, array('self' =>
$this) + $options);
- }
- }
-
- return $this->refFkValues['accessionsRelatedByprocessingPriorityId'];
- }
-
- if ('accessionsRelatedByprocessingStatusId' == $name)
- {
- if (!isset($this->refFkValues['accessionsRelatedByprocessingStatusId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['accessionsRelatedByprocessingStatusId'] =
self::getaccessionsRelatedByprocessingStatusIdById($this->id, array('self' =>
$this) + $options);
- }
- }
-
- return $this->refFkValues['accessionsRelatedByprocessingStatusId'];
- }
-
- if ('accessionsRelatedByresourceTypeId' == $name)
- {
- if (!isset($this->refFkValues['accessionsRelatedByresourceTypeId']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['accessionsRelatedByresourceTypeId'] =
QubitQuery::create();
- }
- else
- {
- $this->refFkValues['accessionsRelatedByresourceTypeId'] =
self::getaccessionsRelatedByresourceTypeIdById($this->id, array('self' =>
$this) + $options);
- }
- }
-
- return $this->refFkValues['accessionsRelatedByresourceTypeId'];
- }
-
- if ('deaccessions' == $name)
- {
- if (!isset($this->refFkValues['deaccessions']))
- {
- if (!isset($this->id))
- {
- $this->refFkValues['deaccessions'] = QubitQuery::create();
- }
- else
- {
- $this->refFkValues['deaccessions'] =
self::getdeaccessionsById($this->id, array('self' => $this) + $options);
- }
- }
-
- return $this->refFkValues['deaccessions'];
- }
-
try
{
if (1 > strlen($value =
call_user_func_array(array($this->getCurrenttermI18n($options), '__get'),
$args)) && !empty($options['cultureFallback']))
@@ -996,7 +996,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -1075,6 +1082,106 @@
return $criteria;
}
+ public static function
addaccessionsRelatedByacquisitionTypeIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::ACQUISITION_TYPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByacquisitionTypeIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByacquisitionTypeIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $this->id);
+ }
+
+ public static function
addaccessionsRelatedByprocessingPriorityIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::PROCESSING_PRIORITY_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByprocessingPriorityIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByprocessingPriorityIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function
addaccessionsRelatedByprocessingStatusIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::PROCESSING_STATUS_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByprocessingStatusIdById($id,
array $options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByprocessingStatusIdCriteria(Criteria
$criteria)
+ {
+ return
self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function
addaccessionsRelatedByresourceTypeIdCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitAccession::RESOURCE_TYPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getaccessionsRelatedByresourceTypeIdById($id, array
$options = array())
+ {
+ $criteria = new Criteria;
+ self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria, $id);
+
+ return QubitAccession::get($criteria, $options);
+ }
+
+ public function addaccessionsRelatedByresourceTypeIdCriteria(Criteria
$criteria)
+ {
+ return self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria,
$this->id);
+ }
+
+ public static function adddeaccessionsCriteriaById(Criteria $criteria, $id)
+ {
+ $criteria->add(QubitDeaccession::SCOPE_ID, $id);
+
+ return $criteria;
+ }
+
+ public static function getdeaccessionsById($id, array $options = array())
+ {
+ $criteria = new Criteria;
+ self::adddeaccessionsCriteriaById($criteria, $id);
+
+ return QubitDeaccession::get($criteria, $options);
+ }
+
+ public function adddeaccessionsCriteria(Criteria $criteria)
+ {
+ return self::adddeaccessionsCriteriaById($criteria, $this->id);
+ }
+
public static function addactorsRelatedByentityTypeIdCriteriaById(Criteria
$criteria, $id)
{
$criteria->add(QubitActor::ENTITY_TYPE_ID, $id);
@@ -1615,106 +1722,6 @@
return self::addtermI18nsCriteriaById($criteria, $this->id);
}
- public static function
addaccessionsRelatedByacquisitionTypeIdCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAccession::ACQUISITION_TYPE_ID, $id);
-
- return $criteria;
- }
-
- public static function getaccessionsRelatedByacquisitionTypeIdById($id,
array $options = array())
- {
- $criteria = new Criteria;
- self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $id);
-
- return QubitAccession::get($criteria, $options);
- }
-
- public function addaccessionsRelatedByacquisitionTypeIdCriteria(Criteria
$criteria)
- {
- return
self::addaccessionsRelatedByacquisitionTypeIdCriteriaById($criteria, $this->id);
- }
-
- public static function
addaccessionsRelatedByprocessingPriorityIdCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAccession::PROCESSING_PRIORITY_ID, $id);
-
- return $criteria;
- }
-
- public static function getaccessionsRelatedByprocessingPriorityIdById($id,
array $options = array())
- {
- $criteria = new Criteria;
- self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$id);
-
- return QubitAccession::get($criteria, $options);
- }
-
- public function addaccessionsRelatedByprocessingPriorityIdCriteria(Criteria
$criteria)
- {
- return
self::addaccessionsRelatedByprocessingPriorityIdCriteriaById($criteria,
$this->id);
- }
-
- public static function
addaccessionsRelatedByprocessingStatusIdCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAccession::PROCESSING_STATUS_ID, $id);
-
- return $criteria;
- }
-
- public static function getaccessionsRelatedByprocessingStatusIdById($id,
array $options = array())
- {
- $criteria = new Criteria;
- self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria, $id);
-
- return QubitAccession::get($criteria, $options);
- }
-
- public function addaccessionsRelatedByprocessingStatusIdCriteria(Criteria
$criteria)
- {
- return
self::addaccessionsRelatedByprocessingStatusIdCriteriaById($criteria,
$this->id);
- }
-
- public static function
addaccessionsRelatedByresourceTypeIdCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitAccession::RESOURCE_TYPE_ID, $id);
-
- return $criteria;
- }
-
- public static function getaccessionsRelatedByresourceTypeIdById($id, array
$options = array())
- {
- $criteria = new Criteria;
- self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria, $id);
-
- return QubitAccession::get($criteria, $options);
- }
-
- public function addaccessionsRelatedByresourceTypeIdCriteria(Criteria
$criteria)
- {
- return self::addaccessionsRelatedByresourceTypeIdCriteriaById($criteria,
$this->id);
- }
-
- public static function adddeaccessionsCriteriaById(Criteria $criteria, $id)
- {
- $criteria->add(QubitDeaccession::SCOPE_ID, $id);
-
- return $criteria;
- }
-
- public static function getdeaccessionsById($id, array $options = array())
- {
- $criteria = new Criteria;
- self::adddeaccessionsCriteriaById($criteria, $id);
-
- return QubitDeaccession::get($criteria, $options);
- }
-
- public function adddeaccessionsCriteria(Criteria $criteria)
- {
- return self::adddeaccessionsCriteriaById($criteria, $this->id);
- }
-
public function getCurrenttermI18n(array $options = array())
{
if (!empty($options['sourceCulture']))
Modified: trunk/lib/model/om/BaseTermI18n.php
==============================================================================
--- trunk/lib/model/om/BaseTermI18n.php Fri Sep 16 19:16:50 2011 (r9747)
+++ trunk/lib/model/om/BaseTermI18n.php Fri Sep 16 20:18:43 2011 (r9748)
@@ -374,7 +374,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', $value))
{
- $value = new DateTime($value);
+ try
+ {
+ $value = new DateTime($value);
+ }
+ catch (Exception $e)
+ {
+ return null;
+ }
}
}
@@ -409,7 +416,10 @@
if (array_key_exists($column->getPhpName(), $this->values))
{
- $criteria->add($column->getFullyQualifiedName(),
$this->param($column));
+ if (null !== $param = $this->param($column))
+ {
+ $criteria->add($column->getFullyQualifiedName(), $param);
+ }
}
$offset++;
Modified: trunk/lib/propel/builder/QubitObjectBuilder.php
==============================================================================
--- trunk/lib/propel/builder/QubitObjectBuilder.php Fri Sep 16 19:16:50
2011 (r9747)
+++ trunk/lib/propel/builder/QubitObjectBuilder.php Fri Sep 16 20:18:43
2011 (r9748)
@@ -1411,7 +1411,14 @@
// separator plus one or more zeros
if (!preg_match('/^\d+[-\/]0*(?:1[0-2]|\d)[-\/]0+$/', \$value))
{
- \$value = new DateTime(\$value);
+ try
+ {
+ \$value = new DateTime(\$value);
+ }
+ catch (Exception \$e)
+ {
+ return null;
+ }
}
}
@@ -1470,7 +1477,10 @@
if (array_key_exists(\$column->getPhpName(), \$this->values))
{
- \$criteria->add(\$column->getFullyQualifiedName(),
\$this->param(\$column));
+ if (null !== \$param = \$this->param(\$column))
+ {
+ \$criteria->add(\$column->getFullyQualifiedName(), \$param);
+ }
}
\$offset++;
--
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.
