Changeset 582 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action

Timestamp:

07/12/10 12:46:30 (14 years ago)

Author:

gaba

Message:

load profiles,terms (elements) in 2 steps , using cache

Location:

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

Files:

• Cache.java (modified) (1 diff)
• CompRegistryProxyAction.java (modified) (3 diffs)
• GenericProxyAction.java (modified) (3 diffs)
• MDTransformer.java (modified) (2 diffs)

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

@@ -81 +81 @@
                         InputStream instream;
                                 try {
-                                        instream = new FileInputStream(f);
+                                        instream = new FileInputStream(f); 
+
                                         return instream;
                                 } catch (FileNotFoundException e) {

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

@@ -1 @@
-package eu.clarin.cmdi.mdservice.action;
+ package eu.clarin.cmdi.mdservice.action;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -36 +39 @@
         public String getFullFormat() {
                 if (compid==null || compid.equals("")) {
-                        return "complist2" + getFormat();
+                        if (getActionkey().equals("elements")){
+                                return "terms2" + getFormat();  
+                        } else {
+                                return "complist2" + getFormat();
+                        }
                 } else {
                         return "comp2" + getFormat();
@@ -60 +67 @@
         }
 
-        
+                
+        @SuppressWarnings("deprecation")        
+        @Override
+        public void prepare() throws Exception {                
+                
+                Admin.notifyUser("CRPA.prepare");
+                if (!getActionkey().equals("elements")) {
+                        super.prepare();
+                } else  {
+                        Admin.notifyUser("CRPA.prepareSourceStream - elements");
+                        String xcid;
+                        InputStream _sourceStream;
+                        InputStream __sourceStream;
+                        InputStream _resultStream;
+                        
+                        _sourceStream = Cache.getCache().getFromCache(getRequestKey());
+                        if (_sourceStream == null) {
+                                        Admin.notifyUser("CRPA.prepareSourceStream- profiles");
+                                        setActionkey("profiles");
+                                        setFormat("xmlresolved");
+                                        __sourceStream = Cache.getCache().getFromCache(getRequestKey());
+                                        if (__sourceStream == null) {
+                                                __sourceStream = getSourceStream();
+                                                xcid = Cache.getCache().putInCache(getRequestKey(),__sourceStream);                     
+                                                Admin.notifyUser("CRPA-putting in cache: " + getRequestKey());  
+                                                __sourceStream = Cache.getCache().getFromCache(getRequestKey());
+                                        } else{
+                                                Admin.notifyUser("CRPA-reading from cache: " + getRequestKey());        
+                                        }
+                                        Admin.notifyUser("CCCRPA." + getTargetRequest());
+                                        Admin.notifyUser("CCCRPA." + getFullFormat());
+                                        MDTransformer.getMDTransformer().setSrcFile(getTargetRequest());
+                                        _sourceStream = MDTransformer.getMDTransformer().transformXML(__sourceStream, getFullFormat());
+                                        Admin.notifyUser("CRPA.- elements");
+                                        setActionkey("elements");
+                                        setFormat("htmllist");
+                                        xcid = Cache.getCache().putInCache(getRequestKey(),_sourceStream);                      
+                                        Admin.notifyUser("CRPA-putting in cache: " + getRequestKey());
+                                        _sourceStream = Cache.getCache().getFromCache(getRequestKey());
+                        }  else {
+                                        Admin.notifyUser("CRPA-reading from cache: " + getRequestKey());
+                        }
+                                /*
+                        File file=new File(Cache.getCache().formPath(getRequestKey()));
+                        Admin.notifyUser("File-absolutePath " + file.getAbsolutePath());
+                        URL url = null;
+                           try{
+                                   url = file.toURL();
+                                   Admin.notifyUser("URL-tostring " + url.toString());
+                                   }  catch (MalformedURLException me){
+                          }
+                         */
+
+                        MDTransformer.getMDTransformer().setSrcFile(getTargetRequest());
+                        _resultStream = MDTransformer.getMDTransformer().transformXML(_sourceStream, getFullFormat());
+
+                        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();
+Admin.notifyUser("terms_autocomplete.txt");
+                        }
+                        
+                        
+                }
+
+        }
+
+
         /**
          * uses base_url and (optionally) compid to form a url

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

@@ -106 +106 @@
                 return resultStream;
     }
-
+        public void setResultStream(InputStream _resultStream){
+                resultStream = _resultStream;
+        }
+        public void setSourceStream(InputStream _sourceStream){
+                sourceStream = _sourceStream;
+        }
+        
         /*
         public InputStream getSourceStream() throws IOException {
@@ -150 +156 @@
         }
         
+        
         public void prepare() throws Exception {                
                 
@@ -156 +163 @@
                 
                 // Caching
-                // does not work yet  see Cache.java for details
-                
-                        String xcid;
+                String xcid;
+                Admin.notifyUser("GPA.prepareSourceStream");
+                sourceStream = Cache.getCache().getFromCache(getRequestKey());
+                if (sourceStream == null) {
+                        //sourceStream = getTargetRequest().openStream();
+                        sourceStream = getSourceStream();
+                        xcid = Cache.getCache().putInCache(getRequestKey(),sourceStream);                       
+                        Admin.notifyUser("putting in cache: " + getRequestKey());                       
                         sourceStream = Cache.getCache().getFromCache(getRequestKey());
-                        if (sourceStream == null) {
-                                //sourceStream = getTargetRequest().openStream();
-                                sourceStream = getSourceStream();
-                                xcid = Cache.getCache().putInCache(getRequestKey(),sourceStream);                       
-                                Admin.notifyUser("putting in cache: " + getRequestKey());                       
-                                sourceStream = Cache.getCache().getFromCache(getRequestKey());
-                        }  else {
-                                Admin.notifyUser("reading from cache: " + getRequestKey());
-                        }
-        
-
-                
+                }  else {
+                        Admin.notifyUser("reading from cache: " + getRequestKey());
+                }
+        
                 if (format.equals("xml")) {                     
                         resultStream = sourceStream;    

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

@@ -114 +114 @@
                 Transformer transformer = tfactory.newTransformer(
                                                                         getXSLStreamSource(transkey));
+                
+                transformer.setParameter("format", transkey);
+                
+                if (srcFile!=null) {
                         
-                transformer.setParameter("format", transkey);
-                
-                if (srcFile!=null) {
                         File f = new File(srcFile.getPath());
-                        
+                            
                         //Admin.notifyUser("src:" + srcFile.getFile());
                         //Admin.notifyUser("fpath:" + f.getAbsolutePath());
@@ -138 +139 @@
                 StreamSource src =new StreamSource();                   
                 src.setInputStream(in);
-                
                 // Transform the source XML to out-stream
                 transformer.transform(src, stream );