Changeset 832 for MDService2/trunk/MDService2/src/eu

Timestamp:

11/02/10 20:52:49 (14 years ago)

Author:

gaba

Message:

QUERY(xml,htmlpage,link) - created; cache properties added - repository,lang,maxDepth

Location:

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

Files:

• Cache.java (modified) (3 diffs)
• GenericProxyAction.java (modified) (2 diffs)
• MDRepoProxyAction.java (modified) (5 diffs)

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

@@ -143 +143 @@
                         e.setAttribute("maximumRecords", "");
                 }
+                
+                if (key_array.length > 6){
+                        e.setAttribute("repository", key_array[6]);
+                }else{
+                        e.setAttribute("repository", "");
+                }
+                if (key_array.length > 7){
+                        e.setAttribute("maxDepth", key_array[7]);
+                }else{
+                        e.setAttribute("maxDepth", "");
+                }
+                if (key_array.length > 8){
+                        e.setAttribute("lang", key_array[8]);
+                }else{
+                        e.setAttribute("lang", "");
+                }
+                
                 DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd:hh-mm-ss");
                 e.setAttribute("date", dateFormat.format(new Date()).toString());
@@ -218 +235 @@
                 
                 if(key_array.length > 1){
-                        //Admin.notifyUser("formPATH- querystring:" + key_array[1]);
+                        Admin.notifyUser("formPATH- querystring:" + key_array[1]);
                         if (key_array[0].equals("recordset")){
                                 query_str = this.transformQuery(key_array[1]);  
@@ -248 +265 @@
                 }
                 if (key_array.length > 5){
-                        xpath_expr = xpath_expr + "and @maximumRecords='"+key_array[5]+"']";
-                }else{
-                        xpath_expr = xpath_expr + " and @maximumRecords='']";
+                        xpath_expr = xpath_expr + "and @maximumRecords='"+key_array[5]+"'";
+                }else{
+                        xpath_expr = xpath_expr + " and @maximumRecords=''";
+                }
+                
+                if (key_array.length > 6){
+                        xpath_expr = xpath_expr + "and @repository='"+key_array[6]+"'";
+                }else{
+                        xpath_expr = xpath_expr + " and @repository=''";
+                }
+                if (key_array.length > 7){
+                        xpath_expr = xpath_expr + "and @maxDepth='"+key_array[7]+"'";
+                }else{
+                        xpath_expr = xpath_expr + " and @maxDepth=''";
+                }
+                if (key_array.length > 8){
+                        xpath_expr = xpath_expr + "and @lang='"+key_array[8]+"']";
+                }else{
+                        xpath_expr = xpath_expr + " and @lang='']";
                 }
                 

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

@@ -40 +40 @@
         private String format;
         private String userMsg;
+        private String repository;
         //private Map<String,Object> session;
          private HttpServletRequest request; 
@@ -114 +115 @@
         }
         
+        public void setRepository(String repository) {
+                this.repository = repository;
+        }
+        
+        public String getRepostory() {
+                return repository;
+        }
         public String getActionkey() {
                 return actionkey;

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

@@ -4 +4 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -9 +11 @@
 import java.io.ByteArrayInputStream;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
-
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 
 import eu.clarin.cmdi.mdservice.model.Query;
@@ -29 +40 @@
 
         private String proxy_key = "mdrepository";
-        
+        private String actionContentType;
+        
+        
+        public String getActionContentType() {
+                return actionContentType;
+        }
+
+        public void setActionContentType(String actionContentType) {
+                this.actionContentType = actionContentType;
+        }
+        
+        @Override
+        public void setFormat(String format) {
+                super.setFormat(format);
+                if (format.toLowerCase().equals("xml")) {
+                        this.actionContentType = "text/xml";
+                } else {
+                        this.actionContentType = "text/html";
+                }
+                
+        }
         @Override
         public String getProxyKey() {
@@ -154 +185 @@
          *    
          * @return
+         * @throws Exception 
          * @throws Exception
          */     
@@ -173 +205 @@
         }
         */
+        
+        @Override
+        public void prepare() throws Exception{
+                super.prepare();
+                
+        }
 }