Changeset 20294 for greenstone3/trunk/src/java/org/greenstone/gsdl3/service/FedoraSearch.java.tmp

Timestamp:

2009-08-17T10:24:54+12:00 (15 years ago)

Author:

kjdon

Message:

changed System.err to logger.error/info

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/service/FedoraSearch.java.tmp (modified) (9 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/FedoraSearch.java.tmp

@@ -44 +44 @@
 import java.lang.Object;
 
+import org.apache.log4j.*;
 
 /**
  *
- * @author <a href="mailto:[email protected]">Chi-Yu Huang</a>
- * @version $Revision$
  *
  */
@@ -55 +54 @@
     extends AbstractSearch {
     
+     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.FedoraSearch.class.getName());
     // the services on offer
     // these strings must match what is found in the properties file
@@ -76 +76 @@
     Element server_elem = (Element)GSXML.getChildByTagName(info, "fedoraServer");
     if (server_elem == null) {
-        System.err.println("FedoraSearch.configure error: no fedoraServer element found");
+        logger.error("no fedoraServer element found");
         return false;
     }
     fedora_server_url = server_elem.getAttribute("url");
-    System.err.println("Fedora Server:" + fedora_server_url);
+    logger.info("Fedora Server:" + fedora_server_url);
 
     if (fedora_server_url.equals("")) {
-        System.err.println("FedoraSearch.configure error: no url for the fedoraServer element");
+        logger.error("no url for the fedoraServer element");
         return false;
     }
@@ -113 +113 @@
     Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list == null) {
-        System.err.println("FedoraSearch Error:: TextQuery request had no paramList.");
+        logger.error("TextQuery request had no paramList.");
         return result;  // Return the empty result
     }
@@ -160 +160 @@
         
         while (result_fedora != null) {
-        System.err.println("Search Result:" + result_fedora.getResultList().length);
+        logger.info("Search Result:" + result_fedora.getResultList().length);
         for (int i=0; i<result_fedora.getResultList().length; i++) {
             ObjectFields o = result_fedora.getResultList()[i];
@@ -202 +202 @@
         }
     } catch (Exception e) {
-        System.err.println("ERROR: " + e.getClass().getName()
+        logger.error("ERROR: " + e.getClass().getName()
                    + ((e.getMessage()==null) ? "" : ": " + e.getMessage()));
     }
@@ -210 +210 @@
     
     // Add a metadata element specifying the number of matching documents
-    //System.err.println("FedoraSearch Number of Documents:" + matchNum);
+    //logger.info("FedoraSearch Number of Documents:" + matchNum);
     GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", ""+matchNum);
     
@@ -222 +222 @@
         // check if query contains any fields name (pid, label, fType....)
         if (query_terms.matches("^("+ matchFields+").+")){
-        System.err.println("Implementing Specific Query....");
+        logger.info("Implementing Specific Query....");
 
         List conditions=fedora.server.search.Condition.getConditions(query_terms);
@@ -241 +241 @@
         fedora_query.setConditions(cond);
         } else {
-        System.err.println("Implementing Simple Query...");
+        logger.info("Implementing Simple Query...");
         fedora_query.setTerms(query_terms);
         }