Changeset - 146ce01816f1
[Not reviewed]
default
0 12 0
Nathan Brink (binki) - 14 years ago 2012-03-28 21:52:09
ohnobinki@ohnopublishing.net
Store the start and end dates of each section meeting. (Phase 1 in bug #122).
12 files changed with 160 insertions and 66 deletions:
0 comments (0 inline, 0 general)
inc/class.schedule.php
Show inline comments
 
@@ -180,54 +180,63 @@ class Schedule
 

	
 
  /**
 
   * \brief
 
   *   Adds a section to this semester after finding the class.
 
   *
 
   * \param $instructor
 
   *   The instructor of this section/section_meeting.
 
   *
 
   * \return
 
   *   NULL on success, a string on error which is a message for the
 
   *   user and a valid XHTML fragment.
 
   */
 
  function addSection($course_name, $letter, $time_start, $time_end, $days, $synonym = NULL, $instructor = NULL, $location = NULL, $type = 'lecture', $slot = 'default', $credit_hours = -1.0)
 
  function addSection($course_name, $letter, $time_start, $time_end, $days, $synonym = NULL, $instructor = NULL, $location = NULL, $type = 'lecture', $slot = 'default', $credit_hours = -1.0, $date_start = NULL, $date_end = NULL)
 
  {
 
    if (empty($letter) && (empty($time_start) || !strcmp($time_start, 'none')) && (empty($time_end) || !strcmp($time_end, 'none')) && empty($days)
 
	&& empty($synonym) && empty($instructor) && empty($location) && (empty($type) || !strcmp($type, 'lecture'))
 
	&& (empty($slot) || !strcmp($slot, 'default')))
 
      return;
 

	
 
    /* reject invalid times */
 
    if (!strcmp($time_start, 'none') || !strcmp($time_end, 'none')
 
	|| $time_start > $time_end)
 
      {
 
	return 'Invalid time specifications for ' . htmlentities($course_name) . '-' . htmlentities($letter)
 
	  . '. Start time: <tt>' . htmlentities($time_start) . '</tt>. End time: <tt>' . htmlentities($time_end) . '</tt>.';
 
      }
 

	
 
    if (!empty($credit_hours) && !is_numeric($credit_hours))
 
      {
 
        return 'Invalid credit-hour specification of <tt>' . htmlentities($credit_hours) . '</tt> for ' . htmlentities($course_name) . '-' . htmlentities($letter) . '. Please use a floating point number or do not enter anything if the number of credit hours is not known.';
 
      }
 

	
 
    if (empty($date_start) != empty($date_end)
 
        || !empty($date_start) && !is_numeric($date_start)
 
        || !empty($date_end) && !is_numeric($date_end))
 
      {
 
        return 'Invalid date range specification of <tt>' . htmlentities($date_start, ENT_QUOTES)
 
          . '</tt> through <tt>' . htmlentities($date_end, ENT_QUOTES)
 
          . '</tt>. Was expecting two valid unix timestamps or two empty values.';
 
      }
 

	
 
    foreach ($this->courses as $course)
 
      if (!strcmp($course_name, $course->getName()))
 
	{
 
	  $section = $course->section_get($letter);
 
	  if (!$section)
 
	    {
 
              $section = new Section($letter, array(), $synonym, $credit_hours);
 
	      $course->section_add($section, $slot);
 
	    }
 
	  $section->meeting_add(new SectionMeeting($days, $time_start, $time_end, $location, $type, $instructor));
 
	  $section->meeting_add(new SectionMeeting($days, $time_start, $time_end, $location, $type, $instructor, $date_start, $date_end));
 

	
 
	  return;
 
	}
 

	
 
    error_log('Could not find class when parsing schedule from postData: ' . $course_name);
 
    echo 'Could not find class: ' . $course_name . "<br />\n";
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Get the school associated with this schedule.
 
   *
inc/class.section.php
Show inline comments
 
@@ -14,26 +14,28 @@
 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
 * GNU Affero General Public License for more details.
 
 *
 
 * You should have received a copy of the GNU Affero General Public License
 
 * along with SlatePermutate.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 

	
 
require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'class.section_meeting.inc';
 
   
 
/**
 
 * \brief
 
 *   Represent a Section associated with a Course.
 
 *
 
 * Iterating over a Section yields section_SectionMeeting objects.
 
 */
 
class Section
 
class Section implements IteratorAggregate
 
{
 

	
 
  private $letter;	// Section letter
 
  private $prof;	// Professor, preserved for Section::__wakeup()
 

	
 
  /* meeting times, array of SectionMeeting */
 
  private $meetings;
 

	
 
  /* the section synonym which uniquely identifies this section/course combination */
 
  private $synonym;
 
  /**
 
   * \brief
 
@@ -61,24 +63,33 @@ class Section
 
   *   is for that number.
 
   * \param $credit_hours
 
   *   The number of credit hours this course is worth.
 
   */
 
  function __construct ($letter, array $section_meetings = array(), $synonym = NULL, $credit_hours = -1.0)
 
  {
 
    $this->letter = $letter;
 
    $this->meetings = $section_meetings;
 
    $this->synonym = $synonym;
 
    $this->credit_hours = (float)$credit_hours;
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Implements the IteratorAggregate interface.
 
   */
 
  public function getIterator()
 
  {
 
    return new ArrayIterator($this->meetings);
 
  }
 

	
 
  public function getLetter()
 
  {
 
    return $this->letter;
 
  }
 

	
 
  /**
 
   * \return
 
   *   This section's synonym -- a unique numeric identifier for this
 
   *   course. NULL if undefined.
 
   */
 
  public function getSynonym()
 
  {
inc/class.section_meeting.inc
Show inline comments
 
@@ -26,25 +26,27 @@
 
 * SectionMeeting class? Doesn't every Section have a unique
 
 * prof/time/location?'' A Cedarville student would retort ``Huh?
 
 * Don't some of your classes have labs in addition to lecture? How do
 
 * you know that you have to go to both a lecture and lab -- and how
 
 * do you handle that some classes have different lecture times for
 
 * different days of the week?''. A Calvin section _is_ a unique
 
 * prof/time/location. At Cedarville, a Section refers to a prof and a
 
 * _set_ of time/location pairs. The generalization is to make each
 
 * Section support a list of meeting times/locations.
 
 */
 
class SectionMeeting
 
{
 
  private $date_start;
 
  private $time_start;
 
  private $date_end;
 
  private $time_end;
 
  private $days;
 
  private $location;
 
  private $instructor;
 

	
 
  /**
 
   * \brief
 
   *   Construct a SectionMeeting.
 
   *
 
   * \param $days
 
   *   A string of single-char day upon which a section meets. Sunday
 
   *   is represented with 'u', Monday with 'm', Tuesday with 't',
 
@@ -55,30 +57,39 @@ class SectionMeeting
 
   *   school_crawl_time_format() or ensure that the time is formatted
 
   *   in 24-hour, 0-padded, 4-digit form (HHMM).
 
   * \param $time_end
 
   *   The time of day when the section meeting ends.
 
   * \param $location
 
   *   Where the meeting occurs. Often a room number of some sort.
 
   * \param $type
 
   *   The type of meeting this is. For lectures, please use
 
   *   'lecture'. For labs, please use 'lab'. For others, use the
 
   *   school's notation.
 
   * \param $instructor
 
   *   The instructor for this section meeting.
 
   * \param $date_start
 
   *   A timestamp marking some time prior to the first occurence of
 
   *   the section_meeting.
 
   * \param $date_end
 
   *   A timestamp marking some time after the end of the last
 
   *   occurence of this section_meeting.
 
   */
 
  public function __construct($days, $time_start, $time_end, $location = NULL, $type = 'lecture', $instructor = NULL)
 
  public function __construct($days, $time_start, $time_end, $location = NULL, $type = 'lecture', $instructor = NULL, $date_start = NULL, $date_end = NULL)
 
  {
 
    $this->days_set($days);
 

	
 

	
 
    $this->date_start = empty($date_start) ? NULL : (int)$date_start;
 
    $this->time_start = $time_start;
 
    $this->date_end = empty($date_end) ? NULL : (int)$date_end;
 
    $this->time_end = $time_end;
 

	
 
    $this->location = $location;
 

	
 
    $this->type = $type;
 
    $this->instructor = $instructor;
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Take a days of week string and store it into our $days of week array.
 
   *
 
@@ -188,24 +199,44 @@ class SectionMeeting
 
   * SectionMeeting().
 
   *
 
   * \return
 
   *   A string indicating the type of section meeting.
 
   */
 
  public function type_get()
 
  {
 
    return $this->type;
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Return the unix timestamp of a time prior to the first section
 
   *   meeting or NULL if unknown.
 
   */
 
  public function date_start_get()
 
  {
 
    return empty($this->date_start) ? NULL : $this->date_start;
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Return the unix timestamp of a time after the last section
 
   *   meeting or NULL if unknown.
 
   */
 
  public function date_end_get()
 
  {
 
    return empty($this->date_end) ? NULL : $this->date_end;
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Check if this section conflicts with the given section.
 
   *
 
   * \param $that
 
   *   The other section for which I should check for conflicts.
 
   * \return
 
   *   TRUE if there is a conflict, FALSE otherwise.
 
   */
 
  public function conflictsWith(SectionMeeting $that)
 
  {
 
    /*
 
     * The two sections meetings can't conflict if the start/end times
 
     * don't overlap. Also, use >= or <= here so that one can say ``I
 
@@ -240,44 +271,49 @@ class SectionMeeting
 
   *   time.
 
   *
 
   * Currently, the AJAX UI doesn't recognize that a given section may
 
   * have multiple meeting times. Thus, we simulate this by having
 
   * multiple instances of the same section but just with different
 
   * times in the UI.
 
   */
 
  public function to_json_array()
 
  {
 
    static $daymap = array(0 => 'm', 1 => 't', 2 => 'w', 3 => 'h', 4 => 'f', 5 => 's', 6 => 'u');
 

	
 
    $json_array = array(
 
			'time_start' => $this->time_start,
 
      'date_start' => empty($this->date_start) ? NULL : $this->date_start,
 
      			'time_start' => $this->time_start,
 
      'date_end' => empty($this->date_end) ? NULL : $this->date_end,
 
			'time_end' => $this->time_end,
 
			'days' => array(),
 
			'location' => $this->location,
 
			'instructor' => $this->instructor,
 
			'type' => $this->type,
 
			);
 

	
 
    for ($day = 0; $day < 7; $day ++)
 
      $json_array['days'][$daymap[$day]] = $this->getDay($day);
 

	
 
    return $json_array;
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Parse a JSON array into a SectionMeeting.
 
   *
 
   * \param $json_array
 
   *   The JSON array to parse.
 
   * \return
 
   *   A shiny, new SectionMeeting.
 
   */
 
  public static function from_json_array(array $json_array)
 
  {
 
    $json_array += array('date_start' => NULL, 'date_end' => NULL);
 
    $days = '';
 
    foreach ($json_array['days'] as $day => $meets)
 
      if ($meets)
 
	$days .= $day;
 
    return new SectionMeeting($days, $json_array['time_start'], $json_array['time_end'], $json_array['location'], $json_array['type'], $json_array['instructor']);
 
    return new SectionMeeting($days, $json_array['time_start'], $json_array['time_end'],
 
			      $json_array['location'], $json_array['type'], $json_array['instructor'],
 
			      $json_array['date_start'], $json_array['date_end']);
 
  }
 
}
inc/class.semester.inc
Show inline comments
 
@@ -86,24 +86,29 @@ class Semester
 
   * \brief
 
   *   Add a class to this Semester.
 
   *
 
   * \param $class
 
   *   The class/course to add.
 
   */
 
  public function class_add(Course $class)
 
  {
 
    $class_parts = Course::parse($class->getName());
 
    if (!isset($class_parts['course']))
 
      throw new ErrorException('I was given a class with an invalid name: `' . $class->getName() . '\'');
 

	
 
    foreach ($class as $course_slot)
 
      foreach ($course_slot as $section)
 
        foreach ($section as $meeting)
 
          $this->time_set_section_meeting($meeting);
 

	
 
    if (!isset($this->departments[$class_parts['department']]))
 
      $this->departments[$class_parts['department']] = array();
 
    $department =& $this->departments[$class_parts['department']];
 

	
 
    $department[$class_parts['course']] = $class;
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Retrieve a class.
 
   *
 
   * \param $dept
 
@@ -212,24 +217,27 @@ class Semester
 
   *   The section itself.
 
   * \param $title
 
   *   The course human-friendly title.
 
   * \param $course_slot_id
 
   *   The slot of the course which this section should be added
 
   *   to. Use 'default' (or don't pass this parameter) if your school
 
   *   does not have the concept of course slots. Ask binki for help
 
   *   figuring this out. Course slots are a sort of
 
   *   inverse/complement to section_meetings.
 
   */
 
  public function section_add($dept, $class, Section $section, $title = NULL, $course_slot_id = 'default')
 
  {
 
    foreach ($section as $meeting)
 
      $this->time_set_section_meeting($meeting);
 

	
 
    $dept = strtoupper($dept);
 
    $class = strtoupper($class);
 

	
 
    if (!isset($this->departments[$dept])
 
	|| !isset($this->departments[$dept][$class]))
 
      {
 
	$classobj = new Course($dept . '-' . $class, $title);
 
	$this->class_add($classobj);
 
      }
 
    else
 
      {
 
	$classobj = $this->departments[$dept][$class];
 
@@ -261,24 +269,26 @@ class Semester
 
   * \param $section_meeting
 
   *   The SectionMeeting to be added to a section which may or may
 
   *   not already be in this Semester.
 
   * \param $course_slot_id
 
   *   The name of the new CourseSlot to create if the given section
 
   *   does not yet exist.
 
   * \param $credit_hours
 
   *   The number of credit hours of the associated course or a
 
   *   negative value if unknown.
 
   */
 
  public function section_meeting_add($dept, $course, $title, $section, $synonym, $section_meeting, $course_slot_id = 'default', $credit_hours = -1.0)
 
  {
 
    $this->time_set_section_meeting($section_meeting);
 

	
 
    $dept = strtoupper($dept);
 
    $course = strtoupper($course);
 

	
 
    if (empty($this->departments[$dept][$course]))
 
      $course_obj = NULL;
 
    else
 
      {
 
	$course_obj = $this->departments[$dept][$course];
 
	$section_obj = $course_obj->section_get($section);
 
      }
 
    if (empty($course_obj) || empty($section_obj))
 
      return $this->section_add($dept, $course, new Section($section, array($section_meeting), $synonym, $credit_hours), $title, $course_slot_id);
 
@@ -393,24 +403,41 @@ class Semester
 
  {
 
    if (count($this->time_starts))
 
      {
 
        $times = filter_outliers($this->time_starts);
 
        $this->time_end = min($times);
 
      }
 

	
 
    return $this->time_start;
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Consider a section_meeting's start and end dates and make
 
   *   appropriate time_start_set_test() and time_end_set_test()
 
   *   calls.
 
   */
 
  public function time_set_section_meeting(SectionMeeting $meeting)
 
  {
 
    $date_start = $meeting->date_start_get();
 
    if (!empty($date_start))
 
      $this->time_start_set_test($date_start);
 

	
 
    $date_end = $meeting->date_end_get();
 
    if (!empty($date_end))
 
      $this->time_end_set_test($date_end);
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Get a semester's year.
 
   */
 
  public function year_get()
 
  {
 
    return $this->year;
 
  }
 

	
 
  /**
 
   * \brief
 
   *   Get a semester's season.
 
   */
 
  public function season_get()
input.php
Show inline comments
 
@@ -145,25 +145,27 @@ elseif ($errors_fix)
 
	  foreach ($course as $section)
 
	    if (is_array($section))
 
	      $my_hc .= '    add_section_n(class_last, ' . json_encode($section['letter']) . ', '
 
		. json_encode($section['synonym']) . ', ' . json_encode($section['start']) . ', '
 
		. json_encode($section['end']) . ', '
 
		. json_encode(array('m' => !empty($section['days'][0]), 't' => !empty($section['days'][1]), 'w' => !empty($section['days'][2]),
 
				    'h' => !empty($section['days'][3]), 'f' => !empty($section['days'][4]),
 
				    's' => !empty($section['days'][5])))
 
		. ', ' . json_encode($section['professor']) . ', '
 
		. json_encode($section['location']) . ', '
 
		. json_encode($section['type']) . ', '
 
		. json_encode($section['slot']) . ', '
 
		. json_encode(isset($section['credit_hours']) ? $section['credit_hours'] : -1) . ');' . PHP_EOL;
 
		. json_encode(isset($section['credit_hours']) ? $section['credit_hours'] : -1) . ', '
 
		. json_encode(empty($section['date_start']) ? NULL : $section['date_start']) . ', '
 
		. json_encode(empty($section['date_end']) ? NULL : $section['date_end']) . ');' . PHP_EOL;
 
	  $my_hc .= PHP_EOL;
 
	}
 
  }
 
else
 
  {
 
    $default_courses = school_default_courses($school);
 
    foreach ($default_courses as $default_class)
 
      $my_hc .= input_course_js($default_class, '    ');
 
  }
 
$my_hc .= '    class_last = add_class();' . PHP_EOL;
 
if ($qtips_always || !isset($_SESSION['saw_qtips']))
 
  {
process.php
Show inline comments
 
@@ -209,28 +209,31 @@ if(!$DEBUG)
 
	      {
 
		if (empty($course['title']))
 
		  $course['title'] = '';
 

	
 
		if (empty($course['credit_hours']))
 
		  $course['credit_hours'] = -1;
 
		$allClasses->addCourse($course['name'], $course['title']);
 

	
 
				foreach($course as $section)
 
				  /* Skip the section name, which isn't a section */
 
					if(is_array($section))
 
					  {
 
					    if (empty($section['slot']))
 
					      $section['slot'] = 'default';
 
					    $section += array(
 
					      'slot' => 'default',
 
					      'date_start' => NULL,
 
					      'date_end' => NULL,
 
					    );
 

	
 
					    $error_string = $allClasses->addSection($course['name'], $section['letter'], $section['start'], $section['end'], arrayToDays(empty($section['days']) ? array() : $section['days'], 'alpha'), $section['synonym'], $section['professor'], $section['location'], $section['type'], $section['slot'], $section['credit_hours']);
 
					    $error_string = $allClasses->addSection($course['name'], $section['letter'], $section['start'], $section['end'], arrayToDays(empty($section['days']) ? array() : $section['days'], 'alpha'), $section['synonym'], $section['professor'], $section['location'], $section['type'], $section['slot'], $section['credit_hours'], $section['date_start'], $section['date_end']);
 
					    if ($error_string !== NULL)
 
					      $errors[] = $error_string;
 
					  }
 
			}
 
		}
 

	
 
		/*
 
		 * Tell the user that his input is erroneous and
 
		 * require him to fix it.
 
		 */
 
		if (count($errors))
 
		  {
school.d/calvin.crawl.inc
Show inline comments
 
@@ -375,45 +375,39 @@ function calvin_crawl_semester(array $sc
 
	  $date_end = $meeting_info_matches[2];
 
	  /* e.g., 'Lecture', 'Practicum' */
 
	  $meeting_type = school_crawl_meeting_type($meeting_info_matches[3]);
 

	
 
	  $days = school_crawl_days_format($school_crawl_log, explode(', ', $meeting_info_matches[5]));
 
	  $time_start = school_crawl_time_format(strptime($meeting_info_matches[6], '%I:%M%p'));
 
	  $time_end = school_crawl_time_format(strptime($meeting_info_matches[7], '%I:%M%p'));
 
	  $meeting_place = $meeting_info_matches[8];
 

	
 
	  foreach (array('date_start', 'date_end', 'meeting_type', 'days', 'time_start', 'time_end', 'meeting_place', 'meeting_type') as $var)
 
	    school_crawl_logf($school_crawl_log, 10, "%s:%s", $var, ${$var});
 

	
 
	  $semester->section_meeting_add($section_id['department'], $section_id['course'], $title, $section_id['section'], $synonym,
 
					 new SectionMeeting($days, $time_start, $time_end, $meeting_place, $meeting_type, $faculty_name), 'default', $credits);
 

	
 
	  /*
 
	   * Try to update semester's longetivity stats to help the
 
	   * school_semester_guess() function:
 
	   */
 
	  $date_start_time = strptime($date_start, '%m/%d/%Y');
 
	  $date_end_time = strptime($date_end, '%m/%d/%Y');
 
	  if ($date_start_time !== FALSE)
 
	    $date_start_time = school_crawl_gmmktime($date_start_time, -5 * 60*60);
 
	  else
 
	    $date_start_time = NULL;
 
	  if ($date_end_time !== FALSE)
 
	    $date_end_time = school_crawl_gmmktime($date_end_time, -5 * 60*60) + 24*60*60;
 
	  else
 
	    $date_end_time = NULL;
 

	
 
	  if ($date_start_time !== FALSE)
 
	    {
 
	      $date_start_time = school_crawl_gmmktime($date_start_time, -5 * 60*60);
 
	      $semester->time_start_pool_add($date_start_time);
 
	  $semester->section_meeting_add($section_id['department'], $section_id['course'], $title, $section_id['section'], $synonym,
 
					 new SectionMeeting($days, $time_start, $time_end, $meeting_place, $meeting_type, $faculty_name, $date_start_time, $date_end_time), 'default', $credits);
 

	
 
	    }
 
	  if ($date_end_time !== FALSE)
 
	    {
 
	      $date_end_time = school_crawl_gmmktime($date_end_time, -5 * 60*60);
 
	      $semester->time_end_pool_add($date_end_time);
 
	    }
 
	}
 
	}
 

	
 
      if (!preg_match(';Page ([0-9]+) of ([0-9]+)\</td\>$;m', $html, $pages))
 
	{
 
	  school_crawl_logf($school_crawl_log, 0, 'Unable to determine the number of pages in this Calvin resultset');
 
	  break;
 
	}
 

	
 
      school_crawl_logf($school_crawl_log, 8, "calvin_crawl(): finished page %d of %d with %d courses.", $pages[1], $pages[2], $list_row - 1);
 

	
 
      $form = array(
 
		    'ACTION*Grp:WSS.COURSE.SECTIONS' => 'NEXT',
school.d/ccbcmd.crawl.inc
Show inline comments
 
@@ -283,36 +283,36 @@ function ccbcmd_crawl_semester($school, 
 
	    continue;
 
	  }
 
	$time_end = strptime($time_end_text, '%I:%M %p');
 
	if ($time_end === FALSE || $time_start === FALSE)
 
	  {
 
	    school_crawl_logf($school_crawl_log, 4, "Error parsing start or end time: start: ``%s'' end: ``%s''.",
 
		    $time_start_text, $time_end_text);
 
	    continue;
 
	  }
 

	
 
	$days = school_crawl_days_str_format($school_crawl_log, $children->item($section_offsets['days'])->textContent);
 

	
 
	$section_dates = $children->item($section_offsets['dates'])->textContent;
 
	$date_start = $date_end = NULL;
 
	if (preg_match(';^([0-9]+)/([0-9]+)-([0-9]+)/([0-9]+)$;', $section_dates, $section_dates_matches))
 
	  {
 
	    $date_start = gmmktime(0, 0, 0, $section_dates_matches[1], $section_dates_matches[2], $semester->year_get());
 
	    $date_end = gmmktime(0, 0, 0, $section_dates_matches[3], $section_dates_matches[4], $semester->year_get());
 
	  }
 

	
 
	$section->meeting_add(new SectionMeeting($days, school_crawl_time_format($time_start), school_crawl_time_format($time_end),
 
						 $children->item($section_offsets['location'])->textContent,
 
						 'lecture',
 
						 $instructor));
 

	
 
	/* check if a semester's date range should be increased */
 
	$section_dates = $children->item($section_offsets['dates'])->textContent;
 
	if (preg_match(';^([0-9]+)/([0-9]+)-([0-9]+)/([0-9]+)$;', $section_dates, $section_dates_matches))
 
	  {
 
	    $semester->time_start_set_test(gmmktime(0, 0, 0, $section_dates_matches[1], $section_dates_matches[2], $semester->year_get()));
 
	    $semester->time_end_set_test(gmmktime(0, 0, 0, $section_dates_matches[3], $section_dates_matches[4], $semester->year_get()));
 
	  }
 
						 $instructor, $date_start, $date_end));
 
      }
 
    }
 

	
 
  return 0;
 
}
 

	
 
function ccbcmd_crawl_curlhook(&$curl)
 
{
 
  /*
 
   * OK, so this must be set to SSLv2 or SSLv3 because of how the
 
   * server's SSL junk is messed up. When curl is built against
 
   * gnutls, though, we can't use SSL2 since it doesn't support that
school.d/cedarville.crawl.inc
Show inline comments
 
@@ -282,46 +282,43 @@ function cedarville_crawl_semester(array
 
		}
 
	      /* prepare for parsing the next meeting time */
 
	      $meetings_str = substr($meetings_str, strlen($meeting_matches[0]));
 

	
 
	      $days = school_crawl_days_str_format($school_crawl_log, $meeting_matches[3]);
 
	      $time_start = school_crawl_time_format(strptime($meeting_matches[4] . 'M', '%I:%M%p'));
 
	      $time_end = school_crawl_time_format(strptime($meeting_matches[5] . 'M', '%I:%M%p'));
 
	      $room = $meeting_matches[2];
 

	
 
	      $type = school_crawl_meeting_type($meeting_matches[1]);
 

	
 
	      /* check for daterange information -- i.e., if the first regex successfully matched: */
 
	      $date_start = $date_end = NULL;
 
	      if (count($meeting_matches) > 7)
 
		{
 
		  $date_start = school_crawl_gmmktime(strptime($meeting_matches[6], '%m/%d/%y'), CEDARVILLE_TIMEZONE_OFFSET);
 
		  $date_end = school_crawl_gmmktime(strptime($meeting_matches[7], '%m/%d/%y'), CEDARVILLE_TIMEZONE_OFFSET);
 
		  if (!empty($date_start) && !empty($date_end))
 
		    {
 
		      $semester->time_start_set_test($date_start);
 
		      $semester->time_end_set_test($date_end);
 
		    }
 
		}
 

	
 
	      /*
 
	       * The tables are made for humans, not computers. If
 
	       * there aren't enough instructors for the number of
 
	       * section meetings, just reuse the first listed
 
	       * instructor:
 
	       */
 
	      if ($meeting_i >= count($instructors))
 
		$instructors[$meeting_i] = $instructors[0];
 

	
 
	      $meetings[] = new SectionMeeting($days, $time_start, $time_end,
 
					       $room, $type, $instructors[$meeting_i]);
 
					       $room, $type, $instructors[$meeting_i],
 
					       $date_start, $date_end);
 

	
 
	      $meeting_i ++;
 
	    }
 

	
 
	  $semester->section_add($section_parts['department'], $section_parts['course'],
 
				 new Section($section_parts['section'], $meetings,
 
					     $synonym, $credit_hours), $title);
 

	
 
	  /*
 
	   * Get the full subject's name from the course's page if we
 
	   * don't have it already.
 
	   */
school.d/hope.crawl.inc
Show inline comments
 
@@ -269,34 +269,35 @@ function hope_crawl_semester(array $scho
 
	  ${$var} = trim($section_csv[$fields[$field]]);
 

	
 
      if ($section_csv[$fields['M']] == 'TBA'
 
	  || $section_csv[$fields['Times']] == 'TBA')
 
	{
 
	  $semester->class_add(new Course($subject_id . '-' . $course_id,
 
					  $section_csv[$fields['Title']]));
 
	  school_crawl_logf($school_crawl_log, 8, "Course %s-%s-%s has a section meeting with a TBA time, adding dummy course.",
 
			    $subject_id, $course_id, $section_id);
 
	  continue;
 
	}
 

	
 
      $date_start = $date_end = NULL;
 
      if (preg_match(',(\\d\\d)/(\\d\\d)-(\\d\\d)/(\\d\\d),', $section_csv[$fields['Date']], $matches))
 
	{
 
	  list(, $m_start, $d_start, $m_end, $d_end) = $matches;
 
	  if ($m_start && $d_start && $m_end && $d_end)
 
	    {
 
	      $y_start = $y_end = $semester->year_get();
 
	      if ($m_end < $m_start)
 
		$y_end ++;
 
	      $semester->time_start_set_test(gmmktime(0, 0, 0, $m_start, $d_start, $y_start));
 
	      $semester->time_end_set_test(gmmktime(0, 0, 0, $m_end, $d_end, $y_end));
 
	      $date_start = gmmktime(0, 0, 0, $m_start, $d_start, $y_start);
 
	      $date_end = gmmktime(0, 0, 0, $m_end, $d_end, $y_end);
 
	    }
 
	}
 

	
 
      if (trim($section_csv[$fields['U']]))
 
	school_crawl_logf($school_crawl_log, 0, "Section %d has sunday.", $synonym);
 
      $days = school_crawl_days_format($school_crawl_log, array_filter(array_slice($section_csv, $fields['M'], 7), '_hope_crawl_days_filter'));
 
      list($time_start, $time_end) = explode('-', $section_csv[$fields['Times']]);
 
      if (strlen($time_start) != 4 || strlen($time_end) != 4)
 
	{
 
	  school_crawl_logf($school_crawl_log, 4, "Section meeting (synonym=%s) has invalidly-formatted start time (%s) or end time (%s). Skipping.",
 
			    $synonym, $time_start, $time_end);
 
	  continue;
 
@@ -305,24 +306,25 @@ function hope_crawl_semester(array $scho
 
      /*
 
       * Guessing the type of section_meeting: `attribute' of NSL
 
       * seems to be associated with labs. Matches `lab', `lab.', `
 
       * lab', ` labo'..., etc.
 
       */
 
      $type = 'lecture';
 
      if (preg_match('/(^|[^a-z])lab($|o|[^a-z])/i', $title))
 
	$type = 'lab';
 

	
 
      $section_meeting = new SectionMeeting($days, $time_start, $time_end,
 
					    $location,
 
					    $type,
 
					    $instructor);
 
					    $instructor,
 
					    $date_start, $date_end);
 
      $semester->section_meeting_add($subject_id,
 
				     $course_id,
 
				     $title,
 
				     $section_id,
 
				     $synonym,
 
				     $section_meeting,
 
				     $type,
 
				     $section_csv[$fields['Cred']]);
 
    }
 
  return 0;
 
}
school.d/umich.crawl.inc
Show inline comments
 
@@ -265,50 +265,49 @@ function umich_crawl_semester(array $sch
 
      $time_start = umich_crawl_time($matches[1], FALSE, $time_end);
 
      /* umich defines course_slots by meeting_type. */
 
      $meeting_type = school_crawl_meeting_type(trim($row[$fields['Component']]));
 

	
 
      /*
 
       * Some information is only presented in the first row in a
 
       * listing of courses. Perform some accumulation here.
 
       */
 
      foreach (array('Instructor') as $key)
 
	if (strlen($curr_value = trim($row[$fields[$key]])))
 
	  $row_accumulation[$key] = $curr_value;
 

	
 
      $semester->section_meeting_add($dept, $course_id, trim($row[$fields['Course Title']]),
 
				     trim($row[$fields['Section']]), $synonym,
 
				     new SectionMeeting($days, $time_start, $time_end,
 
							trim($row[$fields['Location']]),
 
							$meeting_type,
 
							$row_accumulation['Instructor']),
 
				     $meeting_type,
 
				     $credit_hours);
 

	
 
      /*
 
       * If the section so far passed as being a normal section, use
 
       * its start and end dates to help determine the semester's
 
       * respective start and end dates.
 
       * Grab start/stop dates.
 
       */
 
      $date_start = $date_end = NULL;
 
      $date_start_tm = strptime(trim($row[$fields['Start Date']]), '%m/%d/%Y');
 
      $date_end_tm = strptime(trim($row[$fields['End Date']]), '%m/%d/%Y');
 
      if (!empty($date_start_tm) && !empty($date_end_tm))
 
	{
 
	  $date_start = school_crawl_gmmktime($date_start_tm);
 
	  $date_end = school_crawl_gmmktime($date_end_tm);
 
	  if ($date_start > 1000000 && $date_end > 1000000)
 
	  if ($date_start < 1000000 || $date_end < 1000000)
 
	    {
 
	      $semester->time_start_set_test($date_start);
 
	      $semester->time_end_set_test($date_end);
 
	      $date_start = $date_end = NULL;
 
	    }
 
	}
 

	
 
      $semester->section_meeting_add($dept, $course_id, trim($row[$fields['Course Title']]),
 
				     trim($row[$fields['Section']]), $synonym,
 
				     new SectionMeeting($days, $time_start, $time_end,
 
							trim($row[$fields['Location']]),
 
							$meeting_type,
 
							$row_accumulation['Instructor'],
 
							$date_start, $date_end),
 
				     $meeting_type,
 
				     $credit_hours);
 
    }
 
}
 

	
 
/**
 
 * \brief
 
 *   Try to turn a umich-formatted time into something usable.
 
 *
 
 * \param $raw
 
 *   The raw input.
 
 * \param $xm
 
 *   FALSE or, if PM or AM was specified, 'P' for PM and 'A' for AM.
 
 * \param $before
scripts/scheduleInput.js
Show inline comments
 
@@ -8,27 +8,30 @@
 
 * the Free Software Foundation, either version 3 of the License, or
 
 * (at your option) any later version.
 
 *
 
 * SlatePermutate is distributed in the hope that it will be useful,
 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
 * GNU Affero General Public License for more details.
 
 *
 
 * You should have received a copy of the GNU Affero General Public License
 
 * along with SlatePermutate.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 

	
 
    //--------------------------------------------------
 
    // General Notes
 
    //--------------------------------------------------
 
/**
 
 * \file
 
 *
 
 * If you are reading this file, you may be interested in contributing
 
 * to slate_permutate. Please see http://ohnopub.net/w/SlatePermutate .
 
 */
 

	
 
/**
 
 * \brief
 
 *   The next course_i value that will be produced when add_class() is
 
 *   called.
 
 *
 
 * If iterating through all of the possible courses, use (classNum -
 
 * 1) as the upper bound.
 
 */
 
var classNum = 0;
 

	
 
/**
 
@@ -118,25 +121,25 @@ function addTips()
 
        my: 'top left', 
 
        at: 'bottom right'
 
      }
 
    }
 
  );
 

	
 
}
 

	
 
/**
 
 * \brief
 
 *   Add a section to a class.
 
 */
 
function add_section_n(cnum, name, synonym, stime, etime, days, instructor, location, type, slot, credit_hours)
 
function add_section_n(cnum, name, synonym, stime, etime, days, instructor, location, type, slot, credit_hours, date_start, date_end)
 
{
 
    var snum = last_section_i ++;
 
    var cssclasses = 'section class' + cnum + ' ' + safe_css_class('slot-' + slot);
 
    var last_tr;
 

	
 
	/*
 
	 * Add the type of the course to the CSS if it's a valid (and
 
	 * _clean-looking_ CSS class). Supports things like Cedarville's
 
	 * coloration of labs/ILB.
 
	 */
 
	if (/[a-z-]+/.exec(type) != null)
 
		cssclasses += ' type-' + type;
 
@@ -203,24 +206,26 @@ function add_section_n(cnum, name, synon
 
    section_html = section_html + '</select></td>\n\
 
<td class="cbrow"><input type="checkbox" title="Sunday" class="daysRequired" name="postData[' + cnum +'][' + snum + '][days][6]" value="1" ' + (days.u ? 'checked="checked"' : '') + ' /></td>\
 
<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][0]" value="1" ' + (days.m ? 'checked="checked"' : '') + ' /></td>\
 
<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][1]" value="1" ' + (days.t ? 'checked="checked"' : '') + ' /></td>\
 
<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][2]" value="1" ' + (days.w ? 'checked="checked"' : '') + ' /></td>\
 
<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][3]" value="1" ' + (days.h ? 'checked="checked"' : '') + ' /></td>\
 
<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][4]" value="1" ' + (days.f ? 'checked="checked"' : '') + ' /></td>\
 
<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][5]" value="1" ' + (days.s ? 'checked="checked"' : '') + ' /></td>' +
 
	'<td class="removeCell"><div><button class="gray section-meeting-delete">x</button></div></td><td class="emptyCell">' +
 
	'<input class="section-location-entry" type="hidden" name="postData[' + cnum + '][' + snum + '][location]" />' +
 
	'<input class="section-type-entry" type="hidden" name="postData[' + cnum + '][' + snum + '][type]" />' +
 
		'<input class="section-credit-hours-entry" type="hidden" name="postData[' + cnum + '][' + snum + '][credit_hours]" />' +
 
		'<input class="section-date-start-entry" type="hidden" name="postData[' + cnum + '][' + snum + '][date_start]" />' +
 
		'<input class="section-date-end-entry" type="hidden" name="postData[' + cnum + '][' + snum + '][date_end]" />' +
 
	'</td></tr>';
 

	
 
    /*
 
     * Try to append this section to the last section in its
 
     * associated CourseSlot...
 
     */
 
    last_tr = jQuery('tr.class' + cnum + '.' + safe_css_class('slot-' + slot) + ':last');
 
    if (!last_tr.length)
 
    {
 
	/* Also append a a new ``we are this slot'' row... */
 
	course_add_slot_row(cnum, slot);
 
	last_tr = jQuery('tr.class' + cnum + ':last');
 
@@ -235,38 +240,40 @@ function add_section_n(cnum, name, synon
 
    /*
 
     * Store data into the newly created HTML. With this method we
 
     * have to _avoid_ escaping entities in the text we're setting as
 
     * values because the DOM stuff will escape it for us.
 
     */
 
    section_tr.find('.section-letter-entry').val(name);
 
    section_tr.find('.section-synonym-entry').val(synonym);
 
    section_tr.find('.section-slot-entry').val(slot);
 
    section_tr.find('.profName').val(instructor);
 
    section_tr.find('.section-location-entry').val(location);
 
    section_tr.find('.section-type-entry').val(type);
 
	section_tr.find('.section-credit-hours-entry').val(credit_hours);
 
	section_tr.find('.section-date-start-entry').val(date_start);
 
	section_tr.find('.section-date-end-entry').val(date_end);
 

	
 
    /* unhide the saturday and sunday columns if they're used by autocomplete data */
 
	if (days.u)
 
		jQuery('#jsrows col.sunday').removeClass('collapsed');
 
    if (days.s)
 
	jQuery('#jsrows col.saturday').removeClass('collapsed');
 

	
 
	credit_hours_change(cnum);
 

	
 
    return last_section_i - 1;
 
}
 
function add_section(cnum)
 
{
 
    var section_i = add_section_n(cnum, '', '', '', '', {}, '', '', '', 'default', -1);
 
    var section_i = add_section_n(cnum, '', '', '', '', {}, '', '', '', 'default', -1, null, null);
 
    if (cnum == slate_permutate_course_free)
 
	course_free_check(cnum);
 
    return section_i;
 
}
 

	
 
/**
 
 * Add a list of sections gotten via an AJAX call.
 
 */
 
function add_sections(cnum, data)
 
{
 
    var i;
 

	
 
@@ -283,26 +290,33 @@ function add_sections(cnum, data)
 
    if (data.course)
 
	jQuery('.className' + cnum).val(data.course);
 

	
 
    if (!data.sections)
 
	return;
 

	
 
    jQuery.each(data.sections, function(i, section)
 
		{
 
		    if (!section.slot)
 
			section.slot = 'default';
 
			if (section.credit_hours === undefined)
 
				section.credit_hours = -1;
 
			if (section.date_start === undefined)
 
			{
 
				section.date_start = null;
 
				section.date_end = null;
 
			}
 

	
 
		    add_section_n(cnum, section.section, section.synonym, section.time_start, section.time_end, section.days, section.instructor, section.location, section.type, section.slot, section.credit_hours);
 
		    add_section_n(cnum, section.section, section.synonym, section.time_start, section.time_end,
 
						  section.days, section.instructor, section.location, section.type, section.slot,
 
						  section.credit_hours, section.date_start, section.date_end);
 
		});
 

	
 
    /*
 
     * Handle course-level interdependencies.
 
     */
 
    if (data.dependencies)
 
	jQuery.each(data.dependencies, function(i, dep) {
 
			/* Gracefully deprecate the old crawler's JSON format. */
 
			if (dep['class'])
 
			    dep.course = dep['class'];
 

	
 
		var new_course_num = add_class_n(dep.course, dep['title'] ? dep['title'] : '');
0 comments (0 inline, 0 general)