diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/build.yml similarity index 84% rename from .github/workflows/github-actions-demo.yml rename to .github/workflows/build.yml index 4dedfae4..312d975b 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/build.yml @@ -26,5 +26,5 @@ jobs: - uses: akhileshns/heroku-deploy@v3.12.12 with: heroku_api_key: ${{secrets.HEROKU_API_KEY}} - heroku_app_name: "limitless-reef-13572" - heroku_email: "robert@develogical.com" + heroku_app_name: "basic-web-0" + heroku_email: "sding2@andrew.cmu.edu" diff --git a/src/main/java/com/develogical/QueryProcessor.java b/src/main/java/com/develogical/QueryProcessor.java index 832670e6..e7fef524 100644 --- a/src/main/java/com/develogical/QueryProcessor.java +++ b/src/main/java/com/develogical/QueryProcessor.java @@ -1,13 +1,49 @@ package com.develogical; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class QueryProcessor { - + private String cutComma(String s) { + return s.substring(0, s.length() - 1); + } public String process(String query) { + System.out.println("------------------"); + System.out.println(query); + System.out.println("--------------"); + if (query.toLowerCase().contains("shakespeare")) { return "William Shakespeare (26 April 1564 - 23 April 1616) was an " + "English poet, playwright, and actor, widely regarded as the greatest " + "writer in the English language and the world's pre-eminent dramatist."; } + else if (query.toLowerCase().contains("name")) { + return "basic-web-0"; + } + else if (query.toLowerCase().contains("Eiffel")) { + return "Paris"; + } + else if (query.toLowerCase().contains("plus")) { + String[] parts = query.split(" "); + int num1 = Integer.parseInt(parts[3]); + int num2 = Integer.parseInt(parts[5]); + return String.valueOf(num1 + num2); + } + else if (query.toLowerCase().contains("largest")) { + String[] parts = query.split(" "); + int max = Integer.parseInt(parts[parts.length - 1]); + for (int i = 9; i < parts.length - 1; i++) { + int num = Integer.parseInt(cutComma(parts[i])); + max = Math.max(max, num); + + } + return String.valueOf(max); + } + else if (query.toLowerCase().contains("multiplied by")) { + String[] parts = query.split(" "); + int num1 = Integer.parseInt(parts[3]); + int num2 = Integer.parseInt(parts[6]); + return String.valueOf(num1 * num2); + } return ""; } } diff --git a/src/main/java/com/develogical/web/IndexPage.java b/src/main/java/com/develogical/web/IndexPage.java index 7de3044d..51c1ef98 100644 --- a/src/main/java/com/develogical/web/IndexPage.java +++ b/src/main/java/com/develogical/web/IndexPage.java @@ -7,7 +7,7 @@ public class IndexPage extends HtmlPage { @Override protected void writeContentTo(PrintWriter writer) { writer.println( - "
Enter your query in the box below: " + "