Changeset 1852 for MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/GenericAction.java

Timestamp:

04/04/12 08:38:32 (12 years ago)

Author:

gaba

Message:

cache changes

File:

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

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

@@ -82 +82 @@
         }
 
+        public String getOperation() {
+                return getParam("operation");
+        }
+        
         /**
          * Empty implementation, subclasses have to decide themselves, which proxy to take.
@@ -464 +468 @@
          */
         
-         public String getRequestKey() {
-                        String key="";
-                        if (getActionkey()!=null) {
-                                key += getActionkey() + "//-" ;
-                        }else {
-                                key +="//-" ;
-                        }
-                        if (getQuery()!=null) {
-                                key += getQuery() + "//-" ;
-                        } else {
-                                key +="//-" ;
-                        }
-                        if (getCollections()!=null) {
-                                key += getCollections() + "//-";
-                        } else {
-                                key +="//-" ;
-                        }
-                        if (this.getStartRecord()!=null) {
-                                key += getStartRecord() + "//-";
-                        }
-                                else{
-                                        key +="//-" ;
-                        }
-                        if (getMaximumRecords()!=null) {
-                                key += getMaximumRecords() + "//-";
-                        }
-                        else{
-                                key +="//-" ;
-                        }
-                        
-                        key += getRepository()  + "//-";
-                        key += getMaxdepth()  + "//-";
-                        
-                        if (getLang()!=null) {
-                                key += getLang() + "//-";
-                        }else{
-                                key +="//-" ;
-                        }                       
-
-                return key;
-        }
+        public String getRequestKey() {
+                String key="";
+                if (getActionkey()!=null) {
+                        key += getActionkey() + "//-" ;
+                }else {
+                        key +="//-" ;
+                }
+                if (!getQuery().equals("")) {
+                        key += getQuery() + "//-" ;
+                } else {
+                        key += getScanClause() + "//-" ;
+                }
+                key += getOperation() + "//-";
+                
+                key += getCollections() + "//-";
+                
+                key += getStartRecord() + "//-";
+                
+                key += getMaximumRecords() + "//-";
+                
+                key += getRepository()  + "//-";
+                key += getMaxdepth()  + "//-";
+                
+                key += getLang() + "//-";
+                
+        return key;
+}