Changeset 890 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Timestamp:

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

Author:

vronk

Message:

Adding action: admin/cache/htmlpage

Location:

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

Files:

• AdminAction.java (added)
• Cache.java (modified) (2 diffs)
• GenericProxyAction.java (modified) (3 diffs)
• MDRepoProxyAction.java (modified) (2 diffs)

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

@@ -67 +67 @@
                 cacheindex_path = cachepath + Admin.getConfig().getProperty("cacheindex.file");
                 cachecounter = initCachecounter();
+                
         }
         
@@ -74 +75 @@
                 } 
                 return singleton;
+        }
+
+        public String getCacheIndexPath() {
+                return getCache().cacheindex_path;
+                
         }
 

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

@@ -56 +56 @@
         private int maxdepth;
         private String format;
+        private String actionContentType;
         private String userMsg;
         private int repository=1;
@@ -132 +133 @@
                 this.format = format;
         }
-        
+
+        public String getActionContentType() {
+                if (format.toLowerCase().equals("xml")) {
+                        this.actionContentType = "text/xml";
+                } else {
+                        this.actionContentType = "text/html";
+                }
+                
+                return actionContentType;
+        }
+
+        public void setActionContentType(String actionContentType) {
+                this.actionContentType = actionContentType;
+        }
+        
+
         public void setRepository(int repository) {
                 this.repository = repository;
@@ -149 +165 @@
                 actionkey = actionKey;
         }
+
         
         public String getStartRecord() {

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

@@ -41 +41 @@
 
         private String proxy_key = "mdrepository";
-        private String actionContentType;
         
-        
-        public String getActionContentType() {
-                return actionContentType;
-        }
-
-        public void setActionContentType(String actionContentType) {
-                this.actionContentType = actionContentType;
-        }
         
         @Override
@@ -62 +53 @@
         @Override
         public void setFormat(String format) {
-                super.setFormat(format);
-                if (format.toLowerCase().equals("xml")) {
-                        this.actionContentType = "text/xml";
-                } else {
-                        this.actionContentType = "text/html";
-                }
-                
+                super.setFormat(format);                
         }
         @Override