https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114530
Revision: 114530
Author: jeroendedauw
Date: 2012-03-27 16:54:23 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
some extra error handling
Modified Paths:
--------------
trunk/extensions/EducationProgram/maintenance/importWEPFromDB.php
Modified: trunk/extensions/EducationProgram/maintenance/importWEPFromDB.php
===================================================================
--- trunk/extensions/EducationProgram/maintenance/importWEPFromDB.php
2012-03-27 16:49:19 UTC (rev 114529)
+++ trunk/extensions/EducationProgram/maintenance/importWEPFromDB.php
2012-03-27 16:54:23 UTC (rev 114530)
@@ -171,35 +171,44 @@
$course->course_startdate = str_replace( '-', '',
$course->course_startdate );
$course->course_enddate = str_replace( '-', '',
$course->course_enddate );
- if ( $currentId === false || $this->override ) {
- $data = array(
- 'org_id' =>
$this->orgIds[$course->course_university_id],
- 'name' => $name,
- 'mc' => $course->course_coursename,
- 'start' => $course->course_startdate .
'000000',
- 'end' => ( $course->course_enddate ===
'' ? $course->course_startdate : $course->course_enddate ) . '000000',
- 'lang' => $course->course_language,
- 'term' => $term,
- );
-
- if ( $currentId !== false ) {
- $data['id'] = $currentId;
+ if ( array_key_exists( $course->course_university_id,
$this->orgIds ) ) {
+ if ( $currentId === false || $this->override ) {
+ $this->insertCourse( $currentId,
$course, $name, $term, $revAction );
}
+ }
+ else {
+ $this->msg( "\t ERROR: Failed to insert course
'$name'. Linked org does not exist!\n" );
+ }
+ }
+ }
- $courseObject = $courseTable->newFromArray(
- $data,
- $currentId === false
- );
+ protected function insertCourse( $currentId, $course, $name, $term,
$revAction ) {
+ $data = array(
+ 'org_id' =>
$this->orgIds[$course->course_university_id],
+ 'name' => $name,
+ 'mc' => $course->course_coursename,
+ 'start' => $course->course_startdate . '000000',
+ 'end' => ( $course->course_enddate === '' ?
$course->course_startdate : $course->course_enddate ) . '000000',
+ 'lang' => $course->course_language,
+ 'term' => $term,
+ );
- try{
- $courseObject->revisionedSave(
$revAction );
- $this->courseIds[$course->course_id] =
$courseObject->getId();
- }
- catch ( Exception $ex ) {
- $this->msg( "\t ERROR: Failed to insert
course '$name'.\n" );
- }
- }
+ if ( $currentId !== false ) {
+ $data['id'] = $currentId;
}
+
+ $courseObject = EPCourses::singleton()->newFromArray(
+ $data,
+ $currentId === false
+ );
+
+ try{
+ $courseObject->revisionedSave( $revAction );
+ $this->courseIds[$course->course_id] =
$courseObject->getId();
+ }
+ catch ( Exception $ex ) {
+ $this->msg( "\t ERROR: Failed to insert course
'$name'.\n" );
+ }
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
