SlatePermutate Changeset - bd5fe413d184 · protofusion repositories

Changeset - bd5fe413d184

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 15 years ago 2011-01-31 21:27:54
ohnobinki@ohnopublishing.net

Actually take advantage of the code which supports multiple section meetings per section for cedarville's crawler.

1 file changed with 13 insertions and 34 deletions:

school.d/cedarville.inc

0 comments (0 inline, 0 general)

school.d/cedarville.inc

➞

Show inline comments

@@ @@ -227,49 +227,28 @@ function cedarville_crawl($semester, $ve @@
 			      . implode('-', $section_parts));
 		  break;
+		}
 	      /* prepare for parsing the next meeting time */
 	      $meetings_str = substr($meetings_str, strlen($meeting_matches[0]));
 	      if (isset($meetings[$meeting_matches[1]]))
+		{
 		  if ($verbosity > 0 && !isset($meeting_multiple_types[$meeting_matches[1]]))
+		    {
 		      error_log('Section ' . implode('-', $section_parts)
 				. ' has multiple meeting times for meeting_type of '
 				. $meeting_matches[1] . ' which my unflexible code which'
 				. ' could be made more flexible doesn\'t yet support.'
 				. ' Skipping the extra meeting times for this type of meeting.');
 		      /* only give the above error once per type. */
 		      $meeting_multiple_types[$meeting_matches[1]] = TRUE;
+		    }
 		  continue;
 	      $days = school_crawl_days_str_format($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 = $meeting_matches[1];
 	      while (isset($meeting_type_maps[$type]))
 		$type = $meeting_type_maps[$type];
 	      $type = strtolower($type);
 	      $meetings[] = new SectionMeeting($days, $time_start, $time_end,
 					       $room, $type);
+		}
 	      $meetings[$meeting_matches[1]]
 		= array('room' => $meeting_matches[2],
 			'days' => school_crawl_days_str_format($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')),
 			'type' => $meeting_matches[1],
 			);
+	    }
 	  $section_meetings = array();
 	  foreach ($meetings as $meeting)
+	    {
 	      $meeting_type = $meeting['type'];
 	      if (isset($meeting_type_maps[$meeting_type]))
 		$meeting_type = $meeting_type_maps[$meeting_type];
 	      $section_meetings[] = new SectionMeeting($meeting['days'], $meeting['time_start'],
 						       $meeting['time_end'], $meeting['room'],
 						       $meeting_type);
+	    }
 	  $semester->section_add($section_parts['department'], $section_parts['course'],
-				 new Section($section_parts['section'], $section_meetings,
+				 new Section($section_parts['section'], $meetings,
 					     $synonym, $instructor));
+	}
+    }
   return 0;
+}

0 comments (0 inline, 0 general)