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

Timestamp:

10/16/10 20:09:34 (14 years ago)

Author:

vronk

Message:

dcr/rr terms htmllist, welcome-message

File:

• MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/DCRProxyAction.java (modified) (5 diffs)

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

@@ -42 +42 @@
         private static final long serialVersionUID = 1L;
         
-        private final static HashMap<String,Object> dcrs = new HashMap<String,Object>();
-        
         
         public String getDcrid() {
@@ -53 +51 @@
         }
 
-        public HashMap<String, Object> getDCRs() {
-                if (dcrs.size()==0) {
-                        initDCRs();                             
-                }
-                return dcrs;
-        }
-
         public Termset getDCR() {               
                 String dcr_id="";
@@ -66 +57 @@
                 if (getDcrid()!=null && !getDcrid().equals("")) dcr_id = getDcrid();                    
 
-                Termset res = (Termset) getDCRs().get(dcr_id);
+                Termset res = (Termset) Termset.getTermset(dcr_id);
                 if (res==null)          Admin.notifyUser("getDCR(): no termset found for:" + dcr_id);
                 //else
@@ -109 +100 @@
         
         public String getBaseURI() {            
-                return getDCRAttr("url");       
-                
+                return getDCRAttr("url");
         }
         
@@ -163 +153 @@
                 resultStream = urlConnection.getInputStream();
                 }
-        return resultStream; 
-        
+        return resultStream;    
     
         }
-        
-
-        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();
-                }
-
-        }
-        
 
 }