Author: jablko
Date: Fri Oct 29 12:10:24 2010
New Revision: 8657
Log:
Avoid some notices
Modified:
trunk/lib/task/migrate/QubitMigrate.class.php
trunk/lib/task/migrate/QubitMigrate109.class.php
Modified: trunk/lib/task/migrate/QubitMigrate.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate.class.php Fri Oct 29 12:02:00
2010 (r8656)
+++ trunk/lib/task/migrate/QubitMigrate.class.php Fri Oct 29 12:10:24
2010 (r8657)
@@ -89,11 +89,11 @@
protected function deleteStubObjects()
{
// Delete "stub" QubitEvent objects that have no valid "event type"
- if (isset($this->data['QubitEvent']) &&
is_array($this->data['QubitEvent']))
+ if (isset($this->data['QubitEvent']))
{
- foreach ($this->data['QubitEvent'] as $key => $event)
+ foreach ($this->data['QubitEvent'] as $key => $row)
{
- if (!isset($event['type_id']))
+ if (!isset($row['type_id']))
{
unset($this->data['QubitEvent'][$key]);
@@ -106,14 +106,8 @@
}
}
- // If there are no QubitEvent objects left, remove the section
- if ($this->data['QubitEvent'] == array())
- {
- unset($this->data['QubitEvent']);
- }
-
// Remove blank "stub" QubitObjectTermRelation objects
- if (isset($this->data['QubitObjectTermRelation']) &&
is_array($this->data['QubitObjectTermRelation']))
+ if (isset($this->data['QubitObjectTermRelation']))
{
foreach ($this->data['QubitObjectTermRelation'] as $key => $row)
{
@@ -124,14 +118,8 @@
}
}
- // If there are no QubitObjectTermRelation objects left, remove the section
- if ($this->data['QubitObjectTermRelation'] == array())
- {
- unset($this->data['QubitObjectTermRelation']);
- }
-
// Remove blank "stub" QubitRelation objects
- if (isset($this->data['QubitRelation']) &&
is_array($this->data['QubitRelation']))
+ if (isset($this->data['QubitRelation']))
{
foreach ($this->data['QubitRelation'] as $key => $row)
{
@@ -142,12 +130,6 @@
}
}
- // If there are no QubitRelation objects left, remove the section
- if ($this->data['QubitRelation'] == array())
- {
- unset($this->data['QubitRelation']);
- }
-
return $this;
}
Modified: trunk/lib/task/migrate/QubitMigrate109.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate109.class.php Fri Oct 29 12:02:00
2010 (r8656)
+++ trunk/lib/task/migrate/QubitMigrate109.class.php Fri Oct 29 12:10:24
2010 (r8657)
@@ -158,54 +158,63 @@
case 58:
- foreach ($this->data['QubitEvent'] as $key => $value)
+ if (isset($this->data['QubitEvent']))
{
- if (isset($value['date_display']))
+ foreach ($this->data['QubitEvent'] as $key => $value)
{
- $this->data['QubitEvent'][$key]['date'] = $value['date_display'];
+ if (isset($value['date_display']))
+ {
+ $this->data['QubitEvent'][$key]['date'] = $value['date_display'];
- unset($this->data['QubitEvent'][$key]['date_display']);
+ unset($this->data['QubitEvent'][$key]['date_display']);
+ }
}
}
case 59:
- foreach ($this->data['QubitEvent'] as $key => $value)
+ if (isset($this->data['QubitEvent']))
{
- if (isset($value['date']))
+ foreach ($this->data['QubitEvent'] as $key => $value)
{
- foreach ($value['date'] as $culture => $date)
+ if (isset($value['date']))
{
- if (0 == strlen($date))
+ foreach ($value['date'] as $culture => $date)
{
- unset($this->data['QubitEvent'][$key]['date'][$culture]);
+ if (0 == strlen($date))
+ {
+ unset($this->data['QubitEvent'][$key]['date'][$culture]);
+ }
+ }
+
+ if (0 == count($this->data['QubitEvent'][$key]['date']))
+ {
+ unset($this->data['QubitEvent'][$key]['date']);
}
}
- if (0 == count($this->data['QubitEvent'][$key]['date']))
+ if ('0000-00-00' == @$value['end_date'])
{
- unset($this->data['QubitEvent'][$key]['date']);
+ unset($this->data['QubitEvent'][$key]['end_date']);
}
- }
-
- if ('0000-00-00' == @$value['end_date'])
- {
- unset($this->data['QubitEvent'][$key]['end_date']);
- }
- if ('0000-00-00' == @$value['start_date'])
- {
- unset($this->data['QubitEvent'][$key]['start_date']);
+ if ('0000-00-00' == @$value['start_date'])
+ {
+ unset($this->data['QubitEvent'][$key]['start_date']);
+ }
}
}
case 60:
- foreach ($this->data['QubitEvent'] as $key => $value)
+ if (isset($ths->data['QubitEvent']))
{
- if (!isset($value['end_date']) && isset($value['start_date']))
+ foreach ($this->data['QubitEvent'] as $key => $value)
{
- $this->data['QubitEvent'][$key]['end_date'] = $value['start_date'];
+ if (!isset($value['end_date']) && isset($value['start_date']))
+ {
+ $this->data['QubitEvent'][$key]['end_date'] =
$value['start_date'];
+ }
}
}
--
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.
