Changeset 13124 for trunk/gsdl3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java

Timestamp:

2006-10-17T15:52:42+13:00 (18 years ago)

Author:

shaoqun

Message:

added the code to use log4j and replace system.out or system.err to logger.info or logger.error respectively. The commented out output has been replaced with logger.debug. The log file is in web/logs/greenstone.log

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java (modified) (8 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java

@@ -14 +14 @@
 import java.util.Enumeration;
 
+import org.apache.log4j.*;
+
 /** The default greenstone receptionist - needs some extra info for each page
  */
 public class DefaultReceptionist extends TransformingReceptionist {
+
+     static Category logger = Category.getInstance(org.greenstone.gsdl3.core.DefaultReceptionist.class.getName());
     
     protected void addExtraInfo(Element page) {
@@ -27 +31 @@
     String action = page_request.getAttribute(GSXML.ACTION_ATT);
     if (action.equals("s")) {
-        System.err.println("HACK: don't ask for coll info if system action");
+        logger.error("HACK: don't ask for coll info if system action");
         return;
     }
-    ///ystem.out.println("add extra info, page request="+this.converter.getString(page_request));
+    logger.debug("add extra info, page request="+this.converter.getString(page_request));
     // is a collection defined?
     Element param_list = (Element)GSXML.getChildByTagName(page_request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list==null) { // must be the original home page
-        ///ystem.out.println("DefaultReceptionist: no param list, assuming home page");
+        logger.debug(" no param list, assuming home page");
         return;
     }
     Element coll_param = GSXML.getNamedElement(param_list, GSXML.PARAM_ELEM, GSXML.NAME_ATT, GSParams.COLLECTION);
     if (coll_param == null) {
-        ///ystem.out.println("DefaultReceptionist: coll param is null, returning");
+        logger.debug(" coll param is null, returning");
         return;
     }
@@ -75 +79 @@
         
         if (coll_description == null) {
-        System.err.println("DefaultReceptionist: no collection description, returning");
+        logger.error(" no collection description, returning");
         return;
         }
@@ -89 +93 @@
     Element service_list = (Element)GSXML.getChildByTagName(coll_description, GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
     if (service_list == null) {
-        System.err.println("DefaultReceptionist: no service list, returning");
+        logger.error(" no service list, returning");
         // something weird has gone wrong
         return;
@@ -96 +100 @@
     NodeList services = service_list.getElementsByTagName(GSXML.SERVICE_ELEM);
     if (services.getLength()==0) {
-        System.err.println("DefaultReceoptionist: no services found for colllection/cluster "+ coll_name);
+        logger.error("DefaultReceoptionist: no services found for colllection/cluster "+ coll_name);
         return;
     }
@@ -118 +122 @@
 
     // if get here, we need to get the service descriptions
-    ///ystem.out.println("getting services description");
+    logger.debug("getting services description");
         
     // we will send all the requests in a single message
@@ -139 +143 @@
     // check that have same number of responses as collections
     if (services.getLength() != service_responses.getLength()) {
-        System.err.println("DefaultReceptionist Error: didn't get a response for each service - somethings gone wrong!");
+        logger.error(" didn't get a response for each service - somethings gone wrong!");
         // for now, dont use the metadata
     } else {
@@ -149 +153 @@
             GSXML.mergeElements(c1, c2);
         } else {
-            System.err.println("DefaultReceptionist Error: response does not correspond to request!");
+            logger.error(" response does not correspond to request!");
         }