Skip to content
This repository was archived by the owner on Jun 7, 2023. It is now read-only.

Try/catch blocks set up for JSON parsing #196

Merged
bnmnetp merged 5 commits into from
Jul 18, 2016
Merged

Try/catch blocks set up for JSON parsing #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce7a32a
Merge pull request #38 from RunestoneInteractive/master
flysaiah Jul 6, 2016
d6407bd
Merge pull request #39 from RunestoneInteractive/master
flysaiah Jul 7, 2016
a0bfba2
Merge pull request #40 from RunestoneInteractive/master
flysaiah Jul 14, 2016
f98f5f1
Try/catch blocks set up for JSON parsing
Jul 16, 2016
99f6994
Added safety checking to runestonebase
Jul 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions runestone/assess/js/fitb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,16 @@ FITB.prototype.checkLocalStorage = function () {
if (len > 0) {
var ex = localStorage.getItem(eBookConfig.email + ":" + this.divid + "-given");
if (ex !== null) {
var storedData = JSON.parse(ex);
var arr = storedData.answer;
try {
var storedData = JSON.parse(ex);
var arr = storedData.answer;
} catch (err) {
// error while parsing; likely due to bad value stored in storage
console.log(err.message);
localStorage.removeItem(eBookConfig.email + ":" + this.divid + "-given");
return;
}

for (var i = 0; i < this.blankArray.length; i++) {
$(this.blankArray[i]).attr("value", arr[i]);
}
Expand Down
11 changes: 9 additions & 2 deletions runestone/assess/js/mchoice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,15 @@ MultipleChoice.prototype.checkLocalStorage = function () {
if (len > 0) {
var ex = localStorage.getItem(eBookConfig.email + ":" + this.divid + "-given");
if (ex !== null) {
var storedData = JSON.parse(ex);
var answers = storedData.answer.split(",");
try {
var storedData = JSON.parse(ex);
var answers = storedData.answer.split(",");
} catch (err) {
// error while parsing; likely due to bad value stored in storage
console.log(err.message);
localStorage.removeItem(eBookConfig.email + ":" + this.divid + "-given");
return;
}
for (var a = 0; a < answers.length; a++) {
var index = answers[a];
for (var b = 0; b < this.optionArray.length; b++) {
Expand Down
45 changes: 30 additions & 15 deletions runestone/assess/js/timed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Timed.prototype.renderTimedAssess = function () {

Timed.prototype.renderContainer = function () {
this.assessDiv = document.createElement("div"); // container for the entire Timed Component

if (this.fullwidth) {
// allow the container to fill the width - barb
$(this.assessDiv).attr({
Expand Down Expand Up @@ -544,7 +544,7 @@ Timed.prototype.finishAssessment = function () {
this.storeScore();
this.logScore();
$(this.pauseBtn).attr("disabled", true);
this.finishButton.disabled = true;
this.finishButton.disabled = true;
};

Timed.prototype.submitTimedProblems = function (logFlag) {
Expand Down Expand Up @@ -621,17 +621,24 @@ Timed.prototype.shouldUseServer = function (data) {
var storageObj = localStorage.getItem(eBookConfig.email + ":" + this.divid + "-given");
if (storageObj === null)
return true;
var storedData = JSON.parse(storageObj).answer;
if (storedData.length == 4) {
if (data.correct == storedData[0] && data.incorrect == storedData[1] && data.skipped == storedData[2] && data.timeTaken == storedData[3])
return true;
} else if (storedData.length == 7) {
if (data.correct == storedData[0] && data.incorrect == storedData[2] && data.skipped == storedData[4] && data.timeTaken == storedData[6]) {
this.logScore();
return false; // In this case, because local storage has more info, we want to use that if it's consistent
try {
var storedData = JSON.parse(storageObj).answer;
if (storedData.length == 4) {
if (data.correct == storedData[0] && data.incorrect == storedData[1] && data.skipped == storedData[2] && data.timeTaken == storedData[3])
return true;
} else if (storedData.length == 7) {
if (data.correct == storedData[0] && data.incorrect == storedData[2] && data.skipped == storedData[4] && data.timeTaken == storedData[6]) {
this.logScore();
return false; // In this case, because local storage has more info, we want to use that if it's consistent
}
}
var storageDate = new Date(JSON.parse(storageObj[1]).timestamp);
} catch (err) {
// error while parsing; likely due to bad value stored in storage
console.log(err.message);
localStorage.removeItem(eBookConfig.email + ":" + this.divid + "-given");
return;
}
var storageDate = new Date(JSON.parse(storageObj[1]).timestamp);
var serverDate = new Date(data.timestamp);
if (serverDate < storageDate) {
this.logScore();
Expand All @@ -656,12 +663,17 @@ Timed.prototype.checkLocalStorage = function () {

Timed.prototype.restoreAnswers = function (data) {
this.taken = 1;
if (this.taken) {
this.handlePrevAssessment();
}
var tmpArr;
if (data === "") {
tmpArr = JSON.parse(localStorage.getItem(eBookConfig.email + ":" + this.divid + "-given")).answer;
try {
tmpArr = JSON.parse(localStorage.getItem(eBookConfig.email + ":" + this.divid + "-given")).answer;
} catch (err) {
// error while parsing; likely due to bad value stored in storage
console.log(err.message);
localStorage.removeItem(eBookConfig.email + ":" + this.divid + "-given");
this.taken = 0;
return;
}
} else {
tmpArr = [parseInt(data.correct), parseInt(data.incorrect), parseInt(data.skipped), parseInt(data.timeTaken)];
this.setLocalStorage(data);
Expand Down Expand Up @@ -689,6 +701,9 @@ Timed.prototype.restoreAnswers = function (data) {
this.skipped = this.renderedQuestionArray.length;
this.timeTaken = 0;
}
if (this.taken) {
this.handlePrevAssessment();
}
this.renderTimedQuestion();
this.displayScore();
this.showTime();
Expand Down
13 changes: 11 additions & 2 deletions runestone/clickableArea/js/clickable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,17 @@ ClickableArea.prototype.checkLocalStorage = function () {
var ex = localStorage.getItem(eBookConfig.email + ":" + this.divid + "-given");
if (ex !== null) {
this.hasStoredAnswers = true;
var storageObj = JSON.parse(ex);
this.clickedIndexArray = storageObj.answer.split(";");
try {
var storageObj = JSON.parse(ex);
this.clickedIndexArray = storageObj.answer.split(";");
} catch (err) {
// error while parsing; likely due to bad value stored in storage
console.log(err.message);
localStorage.removeItem(eBookConfig.email + ":" + this.divid + "-given");
this.hasStoredAnswers = false;
this.restoreAnswers({});
return;
}
if (this.useRunestoneServices) {
// log answer to server
this.givenIndexArray = [];
Expand Down
11 changes: 10 additions & 1 deletion runestone/common/js/runestonebase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,16 @@ RunestoneBase.prototype.shouldUseServer = function (data) {
var ex = localStorage.getItem(eBookConfig.email + ":" + this.divid + "-given");
if (ex === null)
return true;
var storedData = JSON.parse(ex);
var storedData;
try {
storedData = JSON.parse(ex);
} catch (err){
// error while parsing; likely due to bad value stored in storage
console.log(err.message);
localStorage.removeItem(eBookConfig.email + ":" + this.divid + "-given");
// definitely don't want to use local storage here
return true;
}
if (data.answer == storedData.answer)
return true;
var storageDate = new Date(storedData.timestamp);
Expand Down
13 changes: 11 additions & 2 deletions runestone/dragndrop/js/dragndrop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,17 @@ DragNDrop.prototype.checkLocalStorage = function () {
var ex = localStorage.getItem(eBookConfig.email + ":" + this.divid + "-given");
if (ex !== null) {
this.hasStoredDropzones = true;
var storedObj = JSON.parse(ex);
this.minheight = storedObj.minHeight;
try {
var storedObj = JSON.parse(ex);
this.minheight = storedObj.minHeight;
} catch (err) {
// error while parsing; likely due to bad value stored in storage
console.log(err.message);
localStorage.removeItem(eBookConfig.email + ":" + this.divid + "-given");
this.hasStoredDropzones = false;
this.finishSettingUp();
return;
}
this.pregnantIndexArray = storedObj.answer.split(";");
if (this.useRunestoneServices) {
// store answer in database
Expand Down