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

Timestamp:

11/06/10 21:59:50 (14 years ago)

Author:

gaba

Message:

 

File:

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

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

@@ -4 +4 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 
@@ -119 +120 @@
         }
         
-        public String getRepostory() {
+        public String getRepository() {
                 return repository;
         }
@@ -214 +215 @@
         public URL getBaseURL() throws MalformedURLException {          
                 if (base_url == null) {
-                        base_url = new URL(Admin.getConfig().getProperty(getProxyKey() + ".uri"));
+                        base_url = new URL(getBaseURI());//Admin.getConfig().getProperty(getProxyKey() + ".uri"));
                 }
                 return base_url;
         }
-
+        
         public String getBaseURI() {            
                 String uri =Admin.getConfig().getProperty(getProxyKey() + ".uri");              
@@ -232 +233 @@
         }
         
+        /*
         public String getRequestKey() {
                 String key="";
@@ -246 +248 @@
                 return key;
         }
-
+*/
+
+         public String getRequestKey() {
+                        String key="";
+                        if (getActionkey()!=null) {
+                                key += getActionkey() + "//-" ;
+                        }else {
+                                key +="//-" ;
+                        }
+                        if (getQ()!=null) {
+                                key += getQ() + "//-" ;
+                        } else {
+                                key +="//-" ;
+                        }
+                        if (getCollection()!=null) {
+                                key += getCollection() + "//-";
+                        } else {
+                                key +="//-" ;
+                        }
+                        if (getSquery()!=null) {
+                                key += getSquery() + "//-" ;
+                        } else {
+                                key +="//-" ;
+                        }
+                        if (getStartRecord()!=null) {
+                                key += getStartRecord() + "//-";
+                        }
+                                else{
+                                        key +="//-" ;
+                        }
+                        if (getMaximumRecords()!=null) {
+                                key += getMaximumRecords() + "//-";
+                        }
+                        else{
+                                key +="//-" ;
+                        }
+                        if (getRepository()!=null) {
+                                key += getRepository()  + "//-";
+                        }else{
+                                key +="//-" ;
+                        }
+                        
+                        key += getMaxdepth()  + "//-";
+                        
+                        if (getLang()!=null) {
+                                key += getLang();
+                        }
+                         
+                        return key;
+        }
         public InputStream getSourceStream() throws IOException {               
                 return getTargetRequest().openStream();
@@ -289 +340 @@
                         MDTransformer.getMDTransformer().setSrcFile(getTargetRequest());
                         // getColumns
-                        resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ());
+                        resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),getRepository());
                 }