Changeset 1540 for MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/DCRProxyAction.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/DCRProxyAction.java (modified) (4 diffs)

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

@@ -1 +1 @@
 package eu.clarin.cmdi.mdservice.action;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.net.URLConnection;
-import java.util.HashMap;
-
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
 import org.apache.log4j.Logger;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import eu.clarin.cmdi.mdservice.internal.Admin;
 import eu.clarin.cmdi.mdservice.model.Termset;
 import eu.clarin.cmdi.mdservice.proxy.BasicProxy;
@@ -62 +44 @@
 
                 Termset res = (Termset) Termset.getTermset(dcr_id);
-                if (res==null)          Admin.notifyUser("getDCR(): no termset found for:" + dcr_id);
+                if (res==null)          log.debug("getDCR(): no termset found for:" + dcr_id);
                 //else
-                        //Admin.notifyUser("getDCR():" + res.getAttr("id") + ":" + res.getAttr("url") );
+                        //log.debug("getDCR():" + res.getAttr("id") + ":" + res.getAttr("url") );
                 
                 return res;
@@ -155 +137 @@
                 }
                 
-//              Admin.notifyUser("DCRProxy.targetURL:" + targetURL);
+//              log.debug("DCRProxy.targetURL:" + targetURL);
 
             return targetURL;
@@ -168 +150 @@
                 //TODO NOT integrated in PROXY
                 if ((getQ().equals(ALL) || getQ()==null || getQ().equals("")) && (getActionkey().equals(DATCATS))) {
-                        log.debug("serving terms.file:" + Admin.getConfig().getProperty("terms.file"));
-                        resultStream = this.getClass().getClassLoader().getResourceAsStream(Admin.getConfig().getProperty("terms.file"));
+                        log.debug("serving terms.file:" + Utils.getConfig().getProperty("terms.file"));
+                        resultStream = this.getClass().getClassLoader().getResourceAsStream(Utils.getConfig().getProperty("terms.file"));
                 } else {