Changeset 1540 for MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/TermsProxyAction.java

Timestamp:

09/19/11 10:39:55 (13 years ago)

Author:

gaba

Message:

Utils.java in place of Helpers and Admin
Diagnostics changes in GenericAction?
code arrangement, comments

File:

• MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/TermsProxyAction.java (modified) (6 diffs)

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/TermsProxyAction.java

@@ -8 +8 @@
 import javax.xml.transform.TransformerException;
 
-import eu.clarin.cmdi.mdservice.internal.Admin;
+import org.apache.log4j.Logger;
+
+import eu.clarin.cmdi.mdservice.internal.Utils;
 import eu.clarin.cmdi.mdservice.internal.MDTransformer;
 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;
@@ -23 +25 @@
 public class TermsProxyAction extends GenericProxyAction {
 
+        public static Logger log = Logger.getLogger("TermsProxyAction");
+        
         private static final long serialVersionUID = 1L;
 
@@ -115 +119 @@
                 URL targetURL = null;
                 //targetURL = new URL(getBaseURI() + getQ());
-                Admin.notifyUser("TPA.q: " + getBaseURI() + getQ() + getRepository());
+                log.debug("TPA.q: " + getBaseURI() + getQ() + getRepository());
                 // FIXME: this looks like an ugly hack!
                 //if (getMaxdepth()==0)  setMaxdepth(1);
@@ -126 +130 @@
         public InputStream getSourceStream() throws IOException, NoStylesheetException{
                 String type = getTSAttr("type");
-                Admin.notifyUser("TPA.getSourceStream.TStype: " + type);
+                log.debug("TPA.getSourceStream.TStype: " + type);
                 if (type.equals("dcr") | type.equals("rr")) {   
                         // if dcr|rr call model/matrix/all: http://localhost:8080/MDService2/model/matrix/?q=all
@@ -132 +136 @@
                         URL matrix_all_URL = new URL(getBaseURI() + ALL + "&repository="+ getRepository());
                         //URL matrix_all_URL = new URL(getBaseURI() + ALL );
-                        Admin.notifyUser("TPA.getSourceStream: " + getBaseURI() + ALL);
+                        log.debug("TPA.getSourceStream: " + getBaseURI() + ALL);
                         InputStream stream_matrix_all = matrix_all_URL.openStream(); 
                         InputStream resultStream=null;
@@ -143 +147 @@
                                 //transformer.getParams().put("format","terms2extract");
                                 
-                                Admin.notifyUser("TPA.getSourceStream.transformer.effectiveTranskey: " + transformer.getTranskey() + ", for Termset:" + getTSAttr("name") + '#' + getTSAttr("id"));
+                                log.debug("TPA.getSourceStream.transformer.effectiveTranskey: " + transformer.getTranskey() + ", for Termset:" + getTSAttr("name") + '#' + getTSAttr("id"));
                                 resultStream = transformer.transformXML(stream_matrix_all);//, "terms2extract", getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(), getRepositoryPath());
                                                                 
                         } catch (InterruptedException e) {                              
-                                Admin.notifyUser("TPA.getSourceStream(): "+ e.getMessage());
+                                log.debug("TPA.getSourceStream(): "+ e.getMessage());
                         } catch (TransformerException e) {                              
-                                Admin.notifyUser("TPA.getSourceStream(): "+ e.getMessage());
+                                log.debug("TPA.getSourceStream(): "+ e.getMessage());
                         }                       
                         return resultStream;