diff --git a/latex-to-tiddly.jrex b/latex-to-tiddly.jrex index 5befc7d..3bc06f4 100644 --- a/latex-to-tiddly.jrex +++ b/latex-to-tiddly.jrex @@ -1 +1 @@ -{"capture":"(?s)(.*?enumerate.*?)\\\\item\\s(.*?\\R)(.*)","format":"* ?1","blanks":"null","blanksEnabled":false,"prefix":"?","replacements":[["\\\\item\\s","1. "],["\\t",""],[".*tcolorbox.*",""],[".*codeblock.*","```"],["\\\\keys\\{(.*?)\\}","\u003c\u003ckeys \"$1\"\u003e\u003e"],["\\\\menu\\{(.*?)\\}","\u003c\u003cmenu \"$1\"\u003e\u003e"],["\\\\path\\{(.*?)\\}","\u003c\u003cpath \"$1\"\u003e"],["`(.*?)\u0027","\u0027$1\u0027"],["\\\\emph\\{(.*?)\\}","*$1*"],["\\\\code\\{(.*?)\\}","`$1`"],["`","\u0027"]]} \ No newline at end of file +{"capture":"(?s)(.*?enumerate.*?)\\\\item\\s(.*?\\R)(.*)","format":"* ?1","blanks":"null","blanksEnabled":false,"prefix":"?","replacements":[["\\\\item\\s","1. "],["\\t",""],[".*tcolorbox.*",""],[".*codeblock.*","```"],["\\\\keys\\{(.*?)\\}","\u003c\u003ckeys \"$1\"\u003e\u003e"],["\\\\menu\\{(.*?)\\}","\u003c\u003cmenu \"$1\"\u003e\u003e"],["\\\\path\\{(.*?)\\}","\u003c\u003cpath \"$1\"\u003e\u003e"],["`(.*?)\u0027","\u0027$1\u0027"],["\\\\emph\\{(.*?)\\}","*$1*"],["\\\\code\\{(.*?)\\}","`$1`"],["`","\u0027"],["\\\\strong\\{(.*?)\\}","**$1**"],["\\\\textbf\\{(.*?)\\}","**$1**"]]} \ No newline at end of file diff --git a/tiddlywiki/tiddlers/content/labs/lab05/_Labs_05_Introduction.md b/tiddlywiki/tiddlers/content/labs/lab05/_Labs_05_Introduction.md index 72a616a..11c0c36 100644 --- a/tiddlywiki/tiddlers/content/labs/lab05/_Labs_05_Introduction.md +++ b/tiddlywiki/tiddlers/content/labs/lab05/_Labs_05_Introduction.md @@ -2,6 +2,6 @@ Since we will now have multiple DAO classes we need to ensure that they all have a consistent API, so we will also get you to create a DAO interface. -# Milestone 1 Marking +## Milestone 1 Marking We will continue to mark milestone 1 in this lab session. Carry on working on the rest of this lab and we will visit each of you to carry out the marking. You can continue to make commits and push. Please log in to GitBucket now so that you are ready to be marked. diff --git a/tiddlywiki/tiddlers/content/labs/lab05/_Labs_05_Project Tasks.md b/tiddlywiki/tiddlers/content/labs/lab05/_Labs_05_Project Tasks.md index 0d7c9a9..4176849 100644 --- a/tiddlywiki/tiddlers/content/labs/lab05/_Labs_05_Project Tasks.md +++ b/tiddlywiki/tiddlers/content/labs/lab05/_Labs_05_Project Tasks.md @@ -1,13 +1,9 @@ -# Implement the Remaining DAO Methods - -Implement the following DAO methods in your JDBC DAO: +Implement the remaining DAO methods in your JDBC DAO: * `searchById` * `filterByCategory` -You should use the database to perform the searching and filtering via SQL rather than using collections to perform the filtering. Remember that a production system could have tens of thousands of products --- pulling all of that data across a network just to do the filtering in a collection is very inefficient. +You should use the database to perform the searching and filtering via SQL rather than using collections to perform the filtering. Remember that a production system could have tens of thousands of products --- pulling all of that data across a network just to do the filtering in a collection is horribly inefficient. -# Testing the JDBC DAO - -This is **NOT** required at this point. There is little bit of refactoring that needs to be done to the system to allow us to test the JDBC DAO. We will cover this refactoring in lab 6 and JDBC testing in lab 7. \ No newline at end of file +**Note** --- You may be tempted to adapt your tests to use the new JDBC DAO at this point. This is a great idea, but we have to do a do bit of extra work to make this function correctly. This will be covered in the next two labs. \ No newline at end of file