Changeset 1613 for MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/CompRegistryProxyAction.java

Timestamp:

11/05/11 17:38:57 (13 years ago)

Author:

vronk

Message:

various small changes, clean up code

File:

• MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/CompRegistryProxyAction.java (modified) (8 diffs)

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

@@ -1 @@
- package eu.clarin.cmdi.mdservice.action;
+package eu.clarin.cmdi.mdservice.action;
 
 import java.io.InputStream;
@@ -48 +48 @@
         }
         
-        public void setTargetProxy(){
-                
-                setTargetProxy(new BasicProxy());
-                
+        public void setTargetProxy(){           
+                setTargetProxy(new BasicProxy());               
         }
         
-        @Override
-        /*
         public String getRequestKey() {
-                String key="";
-                if (getActionkey()!=null) {
-                        key += getActionkey() + "//-" ;
-                }
-                if (getCompid()!=null) {
-                        key += getCompid() + "//-" ;
-                }
-                 
-                return key;
-        }
-*/
-         public String getRequestKey() {
                 String key="";
                 if (getActionkey()!=null) {
@@ -107 +91 @@
                         key +="//-" ;
                 }
-                
-                 
                 return key;
         }
@@ -117 +99 @@
         public void prepare()  {                
                 
-                try {
-                
+                try {           
                         //log.debug("CRPA.prepare");
                         if (!getActionkey().equals("elements")) {
@@ -159 +140 @@
                                 //              log.debug("CRPA-putting in cache: " + getRequestKey());
                                                 _sourceStream = Cache.getCache().getFromCache(getRequestKey());
-                                } /*else {
-                                                log.debug("CRPA-reading from cache: " + getRequestKey());
-                                }*/
-                                        /*
-                                File file=new File(Cache.getCache().formPath(getRequestKey()));
-                                log.debug("File-absolutePath " + file.getAbsolutePath());
-                                URL url = null;
-                                   try{
-                                           url = file.toURL();
-                                           log.debug("URL-tostring " + url.toString());
-                                           }  catch (MalformedURLException me){
-                                  }
-                                 */
+                                } 
                                 
                                 if (getFormat().equals("xml")) {                        
@@ -188 +157 @@
                                 setSourceStream(_sourceStream);
                                 setResultStream(_resultStream);
-
-                                /*
-                                if (getFormat().equals("txt")) {
-                                        File f=new File(Cache.getCache().formPath("terms_autocomplete.txt"));
-                                    OutputStream out=new FileOutputStream(f);
-                                    byte buf[]=new byte[1024];
-                                    int len;
-                                    while((len=getResultStream().read(buf))>0)
-                                        out.write(buf,0,len);
-                                    out.close();
-        log.debug("terms_autocomplete.txt");
-                                }
-                                */
                         }
                 } catch(Exception e){
                         
                 }                       
-
         }
-
 
         /**
@@ -226 +180 @@
                 return paramstr;
         }
+
         /*
         public URL getTargetRequest() throws IOException {
@@ -240 +195 @@
         return targetURL;
         }
-        */
-
-        
+        */      
 }