Changeset 1528 for MDService2

Timestamp:

09/08/11 20:37:47 (13 years ago)

Author:

gaba

Message:

genericAction params , loadParams changes

Location:

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action

Files:

• GenericAction.java (modified) (4 diffs)
• RepoAction.java (modified) (1 diff)

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

@@ -51 +51 @@
         private String actionkey = "generic";
         private String q;
-        private String format;
+        private String format = "xml";
         
         private String actionContentType;
@@ -92 +92 @@
          
          public String getQ() {
-                        /*
-                        if  (q == null) {
-                                return "";
-                        } else {
-                                return q;
-                        }       
-                        */
                         return q;
          }
 
          public void setQ(String q) {
-                        //if (q == null) q="";
                         this.q = q;
          }
         
          public void setFormat(String format) {
-                        //if (q == null) q="";
                         this.format = format;
          }
@@ -133 +124 @@
          }
          public String getFormat() {
-                        return getParam("x-cmd-format");
+                        return getParam("format");
          }
          public String getCache() {
-                        return getParam("x-cmd-cache");
+                        return getParam("cache");
          }
          public String getRepository() {
-                        return getParam("x-cmd-repository");
+                        return getParam("repository");
          }
          public String getLang() {
-                        return getParam("x-cmd-lang");
+                        return getParam("lang");
          }
          public String getCollections() {
-                        return getParam("x-cmd-collections");
+                        return getParam("collections");
          }
          public String getColumns() {
-                        return getParam("x-cmd-columns");
+                        return getParam("columns");
          }
           public String getMaxdepth() {
-                 return getParam("x-cmd-maxdepth");
+                 return getParam("maxdepth");
          }
          
@@ -292 +283 @@
                         addParam("maximumRecords","50");
                 }
+                
                 if ( params.get("x-cmd-maxdepth") == null){
-                        addParam("x-cmd-maxdepth","2");
-                }
+                        if (params.get("maxdepth") == null){
+                                addParam("maxdepth","2");
+                        } 
+                } else {
+                        addParam("maxdepth",params.get("x-cmd-maxdepth")[0]);
+                }
+                
                 if ( params.get("x-cmd-repository") == null){
-                        addParam("x-cmd-repository", WorkspaceProfile.getRepositoryByIndex(0));
-                }
+                        if (params.get("repository") == null){
+                                addParam("repository",WorkspaceProfile.getRepositoryByIndex(0));
+                        } 
+                } else {
+                        addParam("repository",params.get("x-cmd-repository")[0]);
+                }
+                
                 if ( params.get("x-cmd-cache") == null){
-                        addParam("x-cmd-cache",Cache.SKIP);
-                }
+                        if (params.get("cache") == null){
+                                addParam("cache",Cache.SKIP);
+                        } 
+                } else {
+                        addParam("cache",params.get("x-cmd-cache")[0]);
+                }
+                
                 if ( params.get("x-cmd-lang") == null){
-                        addParam("x-cmd-lang","en");
-                }
+                        if (params.get("lang") == null){
+                                addParam("lang","en");
+                        } 
+                } else {
+                        addParam("lang",params.get("x-cmd-lang")[0]);
+                }
+                
                 if ( params.get("x-cmd-format") == null){
-                        addParam("x-cmd-format","xml");
+                        if (params.get("format") == null){
+                                if (this.format == null) {
+                                        addParam("format","xml");
+                                } else if (this.format.equals("")){
+                                        addParam("format","xml");
+                                } else {
+                                        addParam("format",this.format);
+                                }
+                        } 
+                } else {
+                        addParam("format",params.get("x-cmd-format")[0]);
                 }
 
                 addParam("fullformat",getFullFormat());
-                addParam("format",getFormat());
                 
         }

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

@@ -83 +83 @@
         @Override
         public String getFullFormat() {         
-                return actionkey + "2" + getFormat();
+                return getActionkey() + "2" + getFormat();
         }
         /**