Shorten locations server-side instead of requiring clients to update

morinted · May 9, 2019 · 2e83b59 · 2e83b59
1 parent 86cb9bf
commit 2e83b59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/course-download/updateDatabase.py b/course-download/updateDatabase.py
@@ -254,6 +254,9 @@ def main():
                             if times[0] == times[1] : continue # an activity with a zero duration
                             activityTypes.append(activityType)
 
+                            locationRows[j] = re.sub("^[^(]+\\(", "(", locationRows[j])
+                            locationRows[j] = re.sub("[()]", "", locationRows[j])
+
                             if args.verbose: print("  ", sectionNumber, activityType, str(activityNumber), fullDay, times[0], times[1])
                             activities.append(
                                 convertActivityCode(activityType) + "," +

diff --git a/schedule-generator/ca/uottawa/ui/ClientGUI.java b/schedule-generator/ca/uottawa/ui/ClientGUI.java
@@ -984,8 +984,6 @@ private void drawSchedule() {
 				String actType = a.getType();
 				String strAct = actType + " " + a.getNumber();
 				String strLoc = a.getPlace();
-
-				strLoc = strLoc.replaceAll("^[^(]+\\(", "(").replaceAll("[()]", "");
 
 				//We should find out what color this activity will be drawn in.
 				switch (actType) {