--- miscJava/SpejdernetScraper/src/dk/thoerup/spejdernetscraper/DefaultServlet.java	2013/08/15 13:50:50	2045
+++ miscJava/SpejdernetScraper/src/main/java/dk/thoerup/spejdernetscraper/DefaultServlet.java	2015/03/20 13:42:28	2456
@@ -29,7 +29,10 @@
 	 */
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		
-		response.setHeader("Access-Control-Allow-Origin", "http://horsensspejder.t-hoerup.dk");//Allow  ajax calls from http://horsensspejder.t-hoerup.dk
+		String origin = request.getHeader("Origin");
+		response.setHeader("Access-Control-Allow-Origin", origin); //Allow  ajax calls from everywhere
+		
+		//response.setHeader("Access-Control-Allow-Origin", "http://horsensspejder.t-hoerup.dk");//Allow  ajax calls from http://horsensspejder.t-hoerup.dk
 		
 		if ( request.getServletPath().equals("/start") ) {
 			Thread t = new Thread( new ScraperWorker() );
@@ -52,6 +55,43 @@
 			response.setContentType("text/plain");
 			response.getWriter().print( currentSaldo );
 			
+		} else if (request.getServletPath().equals("/imdb") ) {
+			
+			String sid = request.getParameter("sid");
+			String tmpSeason = request.getParameter("season");
+			String tmpEpisode = request.getParameter("episode");
+			
+			try {		
+				
+				int season = Integer.parseInt(tmpSeason);
+				int episode = Integer.parseInt(tmpEpisode); 
+				
+				IMDBSeriesScraper imdb = new IMDBSeriesScraper();
+				
+				String title = imdb.fechTitle(sid, season, episode);
+				response.setContentType("text/plain");
+				response.getWriter().print( title );
+				
+			} catch (Exception e) {
+				
+				response.sendError(500, e.getClass().getName() + ": " + e.getMessage());
+			}
+			
+		} else if (request.getServletPath().equals("/imdbgenre") ) {
+			
+			String movieid = request.getParameter("movieid");
+			
+			try {										
+				
+				String genres = IMDBGenreScraper.fetchGenres(movieid);
+				response.setContentType("text/plain");
+				response.getWriter().print( genres );
+				
+			} catch (Exception e) {
+				
+				response.sendError(500, e.getClass().getName() + ": " + e.getMessage());
+			}									
+			
 		} else {
 			RequestDispatcher rd = request.getRequestDispatcher("default.jsp");
 			rd.forward(request, response);