Changeset 689 for MDService2/trunk/MDService2/src/eu

Timestamp:

09/12/10 20:47:10 (14 years ago)

Author:

vronk

Message:

added cache-parameter, small changes to stylesheets (record-detail, title-param)

Location:

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

Files:

• action/Cache.java (modified) (1 diff)
• action/GenericProxyAction.java (modified) (3 diffs)
• model/Query.java (modified) (1 diff)

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

@@ -48 +48 @@
 public class Cache {
         public static String PREFIX = "xc_";
+        
+        public static String USE = "use";
+        public static String REFRESH = "refresh";
+        public static String SKIP= "skip";      
         
         private static Cache singleton;

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

@@ -30 +30 @@
         private String actionkey;
         private String q;
+        private String cache = Cache.USE;
         private String collection;
         private int maxdepth;
@@ -43 +44 @@
         public void setQ(String q) {
                 this.q = q;
+        }
+
+        public String getCache() {
+                return cache;
+        }
+
+        public void setCache(String cache) {
+                this.cache = cache;
         }
 
@@ -177 +186 @@
                 String xcid;
                 Admin.notifyUser("GPA.prepareSourceStream");
-                sourceStream = Cache.getCache().getFromCache(getRequestKey());
-                if (sourceStream == null) {
-                        //sourceStream = getTargetRequest().openStream();
+                if (getCache().equals(Cache.SKIP)) {
+                        
                         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 { 
+                        if (getCache().equals(Cache.USE)) {
+                                        sourceStream = Cache.getCache().getFromCache(getRequestKey());
+                        }
+
+                        if (sourceStream == null) { // either not in cache or cache_flag=refresh
+                                //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());
+                        }
+                }
+                        
                 if (format.equals("xml")) {                     
                         resultStream = sourceStream;    

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java

@@ -176 +176 @@
                 } else if (type.equals(RECORD)) {
                         //  2010-07-11 this is just a hack, because url-encoding the handle acted strange
-                        String corrid = getQueryString().replace('_', '/');
+                        //String corrid = getQueryString().replace('_', '/');
+                        String corrid = getQueryString();
                         targetRequest = "//MdSelfLink[.='" + corrid + "']";                      
                 } else {