Changeset 768 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Timestamp:

10/11/10 10:32:38 (14 years ago)

Author:

vronk

Message:

terms-matrix; model, datcats to terms; model-matrix-all!

Location:

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Files:

• action/Admin.java (modified) (2 diffs)
• action/DCRProxyAction.java (modified) (4 diffs)
• action/GenericProxyAction.java (modified) (3 diffs)
• action/MDTransformer.java (modified) (1 diff)
• model/Termset.java (added)

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Admin.java

@@ -9 +9 @@
 import java.util.Properties;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
 import net.sf.json.JSON;
 import net.sf.json.JSONSerializer;
 import net.sf.json.xml.XMLSerializer;
+
 
 import eu.clarin.cmdi.mdservice.model.Query;
@@ -210 +218 @@
                 System.out.println(msg);
         }
+
+
+        public static InputStream loadFile(String path) {
+                
+                InputStream file=null;
+                 
+                try {                   
+                        file = Admin.class.getClassLoader().getResourceAsStream(path);
+                        
+//                   System.out.println(config_file);
+                        if (file == null) {
+                             Admin.notifyUser("File not found!: " + path);
+                        } else {
+                                
+                                System.out.println("Reading in: " + Admin.class.getClassLoader().getResource(path));
+                                //config_file = new FileInputStream(configPath);
+                //              Properties test = new Properties();
+                        //      test.load(file);
+                        }
+                        /*
+                } catch (FileNotFoundException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                        */
+                }   catch (Exception e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                } 
+                
+                return file;
+        }
+        
+        
+        public static Document getXMLDocument(String path) {
+                Document retdoc=null;
+                try {
+                        
+                DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+                DocumentBuilder docBuilder;
+                        try {
+                                docBuilder = docFactory.newDocumentBuilder();               
+                                try {
+                                        Admin.notifyUser("trying to read from:" + path);
+                                        InputStream xmlstream =  loadFile(path);                                        
+                                        //retdoc= docBuilder.parse(fname);
+                                        retdoc= docBuilder.parse(xmlstream);
+                                        Admin.notifyUser("read in:" + retdoc);
+                                } catch (SAXException e) {
+                                                // TODO Auto-generated catch block
+                                                Admin.notifyUser(e.getMessage());
+                                                e.printStackTrace();
+                                }
+                        } catch (ParserConfigurationException e) {
+                                        // TODO Auto-generated catch block
+                                Admin.notifyUser(e.getMessage());
+                                        e.printStackTrace();
+                        }
+                        
+                 
+            }  catch (IOException ex){
+                //Admin.notifyUser("initCacheCounter:" + ex.toString());
+                ex.printStackTrace();
+            } catch (Exception e) {
+                Admin.notifyUser("Admin.getXMLDocument():" + e.getMessage());
+            }
+            return retdoc;
+        }
+        
+
         
 public static void copyStreams (InputStream in, OutputStream out) throws IOException, InterruptedException {            

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/DCRProxyAction.java

@@ -3 +3 @@
 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.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import eu.clarin.cmdi.mdservice.model.Termset;
 
 /**
@@ -17 +32 @@
 public class DCRProxyAction extends GenericProxyAction {
 
+        private String proxy_key = "dcregistry";
+        
+        private String dcrid;
+        
+        public static String ALL = "all";
+        public static String DATCAT = "datcat";
+        public static String DATCATS = "datcats";
+        
         private static final long serialVersionUID = 1L;
         
-        private String proxy_key = "dcregistry";
+        private final static HashMap<String,Object> dcrs = new HashMap<String,Object>();
+        
+        
+        public String getDcrid() {
+                return dcrid;
+        }
+
+        public void setDcrid(String dcrid) {
+                this.dcrid = dcrid;
+        }
+
+        public HashMap<String, Object> getDCRs() {
+                if (dcrs.size()==0) {
+                        initDCRs();                             
+                }
+                return dcrs;
+        }
+
+        public Termset getDCR() {               
+                String dcr_id="";
+                if (getQ()!=null && !getQ().equals("")) dcr_id = getQ();
+                // override with dcrid-param
+                if (getDcrid()!=null && !getDcrid().equals("")) dcr_id = getDcrid();                    
+
+                Termset res = (Termset) getDCRs().get(dcr_id);
+                if (res==null)
+                        Admin.notifyUser("getDCR(): no termset found for:" + dcr_id);
+                else
+                        Admin.notifyUser("getDCR():" + res.getAttr("id") + ":" + res.getAttr("url") );
+                
+                return res;
+        }
+        
+        public String getDCRAttr(String key) {  
+                Termset dcr = getDCR();
+                String val=""; 
+                if (dcr!=null) val= dcr.getAttr(key);
+                 return val;
+        }
         
         @Override
@@ -25 +86 @@
                 return proxy_key;
         }
-        
          
         public String getFullFormat() {
-                        return "dc2" + getFormat();             
-        }
-        
+                Termset dcr = getDCR();
+                String srcformat="", srctype=""; 
+                if (dcr!=null){ 
+                                srcformat = dcr.getAttr("format");
+                                srctype = dcr.getAttr("type");
+                } else { 
+                         srcformat = ALL;
+                         srctype = "datcat";
+                }
+                        return srctype + "-" + srcformat  + "2" + getFormat();          
+        }
+        
+        public URL getBaseURL() throws MalformedURLException {
+                
+                String url= getDCRAttr("url");
+                
+                if (base_url == null) {
+                        if (url.equals("")) {
+                                base_url = null;
+                        } else {
+                                base_url = new URL(url);
+                        }
+                }
+                return base_url;
+        }
         
         /**
@@ -41 +123 @@
 
                 URL targetURL = null;
-                if (getQ()==null || getQ().equals("")) {
-                //      Admin.notifyUser("ERROR DCRProxy.targetURL: missing param Q!");
-                        targetURL =new URL( getBaseURL(), getActionkey());
+        
+                //if (getActionkey().equals(DATCATS)) {
+                targetURL =getBaseURL();
+                /*
+                        if (getQ()==null || getQ().equals("")) {                        
+                                        // get all available datcat-sets from terms_setup.xml
+                                
+                                targetURL =getBaseURL();
+                        } else {
+                                targetURL =new URL( getBaseURL(), "/" + getQ());
+                        }
+                        */
+                Admin.notifyUser("DCRProxy.targetURL:" + targetURL);
+
+            return targetURL;
+        }
+        
+        public InputStream getSourceStream() throws IOException {
+
+                InputStream resultStream = null; 
+                // if no arguments  - get the local-config file
+                if ((getQ()==null || getQ().equals("")) && (getActionkey().equals(DATCATS))) {
+                        resultStream = this.getClass().getClassLoader().getResourceAsStream(Admin.getConfig().getProperty("datcats.file"));             
                 } else {
-                        targetURL =new URL( getBaseURL(), getActionkey() + "/" + getQ());
-                }
-                Admin.notifyUser("DCRProxy.targetURL:" + targetURL);
-
-            return targetURL;
-        }
-        
-        public InputStream getSourceStream() throws IOException {
-        
+                
                 /* need to set Request-Property: Accept to xml 
                  * for to get dcif/xml from DCR-server by means of content negotiation */
                 URLConnection urlConnection = getTargetRequest().openConnection();
-        urlConnection.setRequestProperty("Accept", "application/dcif+xml");
+                
+                if (getDCRAttr("format").equals("dcif")) {              
+                        urlConnection.setRequestProperty("Accept", "application/dcif+xml");
+                        Admin.notifyUser("setting header Accept:" + urlConnection.getRequestProperty("Accept"));
+                }
+        //urlConnection.setRequestProperty("Accept-Language", getLang());
+        
+        //
+                resultStream = urlConnection.getInputStream();
+                }
+        return resultStream; 
+        
     
-        return urlConnection.getInputStream();
-    
-        }       
+        }
+        
+
+        public void initDCRs() {
+                if (dcrs.size() > 0) {  
+                }
+                
+                Document dcrs_setup = Admin.getXMLDocument(Admin.getConfig().getProperty("datcats.file"));
+        
+        //      Admin.loadFile(Admin.getConfig().getProperty("service.list.file"));              
+                Admin.notifyUser("initDCRs().loaded:" + dcrs_setup.getDocumentURI());
+                Admin.notifyUser("firstchild:" + dcrs_setup.getFirstChild());           
+                //.getDocumentElement().getLocalName()
+                //Document chains_doc = Admin.getXMLDocument(Admin.getConfig().getProperty("chains.file"));
+
+                //Admin.notifyUser("formPath:xpath:"+xpath_expr);
+                //creating an XPathFactory:
+        XPathFactory factory = XPathFactory.newInstance();
+        //using this factory to create an XPath object: 
+        XPath xpath = factory.newXPath();
+        //XPath object created compiles the XPath expression: 
+        XPathExpression expr;
+                try {
+                        expr = xpath.compile("//Termset");
+                        //expression is evaluated with respect to a certain context node which is doc.
+                Object result = expr.evaluate(dcrs_setup, XPathConstants.NODESET);
+                NodeList list = (NodeList) result;
+
+                // <Termset type="dcr" id="isocat" label="isoCAT" url="http://www.isocat.org/rest/" format="dcif" />
+                for (int i = 0; i<list.getLength();i++) {
+                        //String value = list.item(i).getTextContent();
+                        Node n = list.item(i);                          
+                        Termset ts = new Termset(n);                    
+                                                
+                        Admin.notifyUser("reading in dcr:" + ts.getAttr("id"));
+                        dcrs.put(ts.getAttr("id"), ts );
+                }    
+                } catch (XPathExpressionException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+
+        }
+        
+
 }

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java

@@ -36 +36 @@
         private String startRecord;
         private String maximumRecords;
+        private String lang="en";
         private int maxdepth;
         private String format;
@@ -137 +138 @@
         }
         
+
+        public String getLang() {
+                return lang;
+        }
+
+        public void setLang(String lang) {
+                this.lang = lang;
+        }
 
         public String getFullFormat() {         
@@ -193 +202 @@
 */
         
-        private URL base_url ;
+        protected URL base_url ;
         
         public URL getBaseURL() throws MalformedURLException {          

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDTransformer.java

@@ -98 +98 @@
                 //Admin.notifyUser(this.getClass().getClassLoader().getResource(xslPath).toString());
                 //Admin.notifyUser(this.getClass().getClassLoader().getResource(xslPath).getPath());
+                
                 
                 streamSource.setSystemId(this.getClass().getClassLoader().getResource(xslPath).toString());