From d908f4c81e71ef7db4d086afcf72af84f34b9cdb Mon Sep 17 00:00:00 2001
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Date: Thu, 4 Oct 2018 18:57:41 -0400
Subject: Update

---
 crsq1.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'crsq1.js')

diff --git a/crsq1.js b/crsq1.js
index 0f4e8dd..c392c14 100644
--- a/crsq1.js
+++ b/crsq1.js
@@ -1,6 +1,10 @@
 (function () {
 "use strict";
 
+const BAD_LINK_RE = /\/Apps\/WebObjects\/cdm\.woa\/[0-9]+\/wo\/[A-Za-z0-9]+\/[0-9.]+/;
+const COURSE_ID_RE = /^([A-Z]{2})[\/ ]+([A-Z]{2,4})\s+([0-9]{4})\s+([0-9.]+)$/;
+const LINK_YEAR_RE = /^[A-Za-z\/]+\s+([0-9]+)/
+
 let scheduleLinks = document.evaluate('//a[contains(text(), " Course Schedule")]', document.body);
 if (!scheduleLinks)
     return;
@@ -10,26 +14,21 @@ while ((scheduleLink = scheduleLinks.iterateNext())) {
     scheduleLinksa.push(scheduleLink);
 }
 
-const BAD_LINK_RE = /\/Apps\/WebObjects\/cdm\.woa\/[0-9]+\/wo\/[A-Za-z0-9]+\/[0-9.]+/;
-const COURSE_ID_RE = /^([A-Z]{2})[\/ ]+([A-Z]{2,4})\s+([0-9]{4})\s+([0-9.]+)$/;
-const LINK_YEAR_RE = /^[A-Za-z\/]+\s+([0-9]+)/
-
 scheduleLinksa.forEach(function (scheduleLink) {
     if (BAD_LINK_RE.test(scheduleLink.pathname)) {
         let courseId = COURSE_ID_RE.exec(scheduleLink.parentNode.parentNode.children[0].textContent);
         if (!courseId)
             return;
-        let year, sess;
+        let sess;
         if (scheduleLink.textContent.startsWith("Fall/Winter")) {
             sess = "FW";
-            year = LINK_YEAR_RE.exec(scheduleLink.textContent)[1];
         } else if (scheduleLink.href.startsWith("Summer")) {
             sess = "SU";
-            year = LINK_YEAR_RE.exec(scheduleLink.textContent)[1];
         }
-        if (year && sess) {
+        let rematch = LINK_YEAR_RE.exec(scheduleLink.textContent);
+        if (rematch && sess) {
             scheduleLink.pathname = "/Apps/WebObjects/cdm.woa/wa/crsq";
-            scheduleLink.search = `fa=${courseId[1]}&sj=${courseId[2]}&cn=${courseId[3]}&cr=${courseId[4]}&ay=${year}&ss=${sess}`;
+            scheduleLink.search = `fa=${courseId[1]}&sj=${courseId[2]}&cn=${courseId[3]}&cr=${courseId[4]}&ay=${rematch[1]}&ss=${sess}`;
         }
     }
 });
-- 
cgit v1.2.3-54-g00ecf