Changeset 870 for MDService2/trunk/MDService2/src/eu

Timestamp:

11/10/10 12:58:33 (14 years ago)

Author:

gaba

Message:

 

Location:

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

Files:

• Cache.java (modified) (1 diff)
• GenericProxyAction.java (modified) (5 diffs)

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

@@ -158 +158 @@
                 }else{
                         e.setAttribute("lang", "");
+                }
+                if (key_array.length > 9){
+                        e.setAttribute("duration", key_array[9]);
+                }else{
+                        e.setAttribute("duration", "");
                 }
                 

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

@@ -59 +59 @@
         //private Map<String,Object> session;
          private HttpServletRequest request; 
-
+         private long duration = 0;
+         
         public String getQ() {
                 return q;
@@ -314 +315 @@
                         
                         if (getLang()!=null) {
-                                key += getLang();
-                        }
+                                key += getLang() + "//-";
+                        }else{
+                                key +="//-" ;
+                        }
+                        
                          
                         return key;
@@ -424 +428 @@
         }
         
+        public String addDurationKey(){
+                String req_key = getRequestKey();
+        
+                Double duration_d;
+
+            duration_d = (double)duration; 
+            duration_d = duration_d/1000.0;
+                req_key += duration_d + "//-";
+                return req_key;
+        }
+        
         public void prepare() throws Exception {                
                 
@@ -445 +460 @@
                         if (sourceStream == null) { // either not in cache or cache_flag=refresh
                                 //sourceStream = getTargetRequest().openStream();
+                                long startMillis = System.currentTimeMillis();
                                 sourceStream = getSourceStream();
+                                duration = System.currentTimeMillis() - startMillis;
+                                req_key = addDurationKey();
+                                
+                                long now = System.currentTimeMillis();
                                 xcid = Cache.getCache().putInCache(req_key,sourceStream);                       
                                 Admin.notifyUser("putting in cache: " + req_key);                       
@@ -478 +498 @@
         //Admin.notifyUser(String.valueOf(getSession()));
         
+        long now = System.currentTimeMillis();
+
                 prepare();
+                long duration = (System.currentTimeMillis() - now);
+                //duration
+
                 if (resultStream == null) {
                         return ERROR;