fix small bugs

muhammad-sayed-mahdy · Jul 1, 2020 · aaa2ed8 · aaa2ed8
1 parent a5749a9
commit aaa2ed8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/search/src/main/java/AddSuggestionsServlet.java b/search/src/main/java/AddSuggestionsServlet.java
@@ -44,9 +44,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 			}
 		}
 
-		PrintWriter out = response.getWriter();
 		response.setContentType("application/json");
 		response.setCharacterEncoding("UTF-8");
+		PrintWriter out = response.getWriter();
 
 		boolean result = adapter.addQuery(query);
 

diff --git a/search/src/main/java/FetchAllSuggestionsServlet.java b/search/src/main/java/FetchAllSuggestionsServlet.java
@@ -22,9 +22,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 		Gson gson = new Gson();
 		IndexerDbAdapter adapter = new IndexerDbAdapter();
 		adapter.open();
-		PrintWriter out = response.getWriter();
 		response.setContentType("application/json");
 		response.setCharacterEncoding("UTF-8");
+		PrintWriter out = response.getWriter();
 
 		ArrayList<String> result = adapter.fetchAllQueries();
 

diff --git a/search/src/main/java/Indexer.java b/search/src/main/java/Indexer.java
@@ -121,18 +121,18 @@ private void HTMLParser() {
      * This function get last modified date stored by server
      **/
     public String getLastModified() {
-        // try {
-        //     String date = connection.execute().header("Last-Modified");
-        //     ArrayList<String> dateArrayList = new ArrayList<>();
-        //     if (date == null)
-        //         return "1 jan 1990";
-        //     else {
-        //         dateArrayList = WordsExtractionProcess.SplitStrings(date);
-        //         return dateArrayList.get(1) +" "+ dateArrayList.get(2) + " " + dateArrayList.get(3);
-        //     }
-        // } catch (IOException e) {
-        //     e.printStackTrace();
-        // }
+        try {
+            String date = connection.execute().header("Last-Modified");
+            ArrayList<String> dateArrayList = new ArrayList<>();
+            if (date == null)
+                return "1 jan 1990";
+            else {
+                dateArrayList = WordsExtractionProcess.SplitStrings(date);
+                return dateArrayList.get(1) +" "+ dateArrayList.get(2) + " " + dateArrayList.get(3);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         return "1 jan 1990";
     }
 

diff --git a/search/src/main/java/QueryServlet.java b/search/src/main/java/QueryServlet.java
@@ -20,9 +20,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 		String query = request.getParameter("query");
 		String image = request.getParameter("img");
 		int page = Integer.parseInt(request.getParameter("page"));
-		PrintWriter out = response.getWriter();
 		response.setContentType("application/json");
 		response.setCharacterEncoding("UTF-8");
+		PrintWriter out = response.getWriter();
 		Gson gson = new Gson();
 		boolean isImage = (image != null && image.equals("1")) ? true : false;
 

diff --git a/search/src/main/java/TrendsServlet.java b/search/src/main/java/TrendsServlet.java
@@ -22,9 +22,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         adapter.open();
 
         String region = request.getParameter("region");
-		PrintWriter out = response.getWriter();
 		response.setContentType("application/json");
 		response.setCharacterEncoding("UTF-8");
+		PrintWriter out = response.getWriter();
 		Gson gson = new Gson();