Changeset 2562

Timestamp:

02/11/13 08:55:16 (11 years ago)

Author:

twagoo

Message:

Added logging for ISOcat servlet

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main

Files:

• java/clarin/cmdi/componentregistry/servlet/IsocatServlet.java (modified) (3 diffs)
• resources/log4j.properties (modified) (1 diff)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/servlet/IsocatServlet.java

@@ -2 +2 @@
 
 import clarin.cmdi.componentregistry.Configuration;
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
 import java.io.IOException;
 import java.net.URI;
-
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -13 +15 @@
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriBuilder;
-
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * 
+ *
  * Servlet responsible for providing a bridge to the isocat REST interface. Can be called by the frontend to circumvent crosscripting and
  * FLASH/Browser limitation in setting the headers of a request.
- * 
+ *
  */
 public class IsocatServlet extends HttpServlet {
 
+    private final static Logger logger = LoggerFactory.getLogger(IsocatServlet.class);
     private static final long serialVersionUID = 1L;
     private transient WebResource service;
@@ -32 +33 @@
     @Override
     public void init(ServletConfig config) throws ServletException {
-        super.init(config);
-        URI uri = UriBuilder.fromUri(Configuration.getInstance().getIsocatRestUrl()).build();
-        Client client = Client.create();
-        service = client.resource(uri);
+        super.init(config);
+        URI uri = UriBuilder.fromUri(Configuration.getInstance().getIsocatRestUrl()).build();
+        Client client = Client.create();
+        service = client.resource(uri);
+        logger.info("Instantiated ISOcat servlet on URI {}", uri);
     }
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
-        queryParams.add("dcif-mode", "list");
-        String keywords = req.getParameter("keywords");
-        queryParams.add("keywords", keywords);
-        String type = req.getParameter("type"); //simple, complex or no type param to search in everything
-        if (type != null) {
-            queryParams.add("type", type);
-        }
-        queryParams.add("profile", "Metadata"); //always search in metadata profile
-        resp.setContentType(MediaType.TEXT_XML);
-        String result = service.path("/user/guest/search").queryParams(queryParams).accept(DCIF_XML).get(String.class);
-        resp.getWriter().write(result);
-        resp.flushBuffer();
+        MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
+        queryParams.add("dcif-mode", "list");
+        String keywords = req.getParameter("keywords");
+        logger.debug("ISOcat request: keywords = {}", keywords);
+        queryParams.add("keywords", keywords);
+        String type = req.getParameter("type"); //simple, complex or no type param to search in everything
+        logger.debug("ISOcat request: type = {}", type);
+        if (type != null) {
+            queryParams.add("type", type);
+        }
+        queryParams.add("profile", "Metadata"); //always search in metadata profile
+        resp.setContentType(MediaType.TEXT_XML);
+
+        final WebResource requestResource = service.path("/user/guest/search").queryParams(queryParams);
+        logger.info("Forwarding ISOcat request to {}", requestResource.getURI());
+        
+        final String result = requestResource.accept(DCIF_XML).get(String.class);
+        logger.debug("ISOcat result: {}", result);
+        resp.getWriter().write(result);
+        resp.flushBuffer();
     }
-
 }

ComponentRegistry/trunk/ComponentRegistry/src/main/resources/log4j.properties

@@ -13 +13 @@
 log4j.logger.clarin.cmdi.componentregistry.rest=WARN
 log4j.logger.clarin.cmdi.componentregistry.impl.database=WARN
+log4j.logger.clarin.cmdi.componentregistry.servlet.IsocatServlet=WARN
 
 # Logging for initialization