Changeset 1523 for MDService2

Timestamp:

09/06/11 21:09:07 (13 years ago)

Author:

gaba

Message:

 

Location:

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

Files:

• GenericAction.java (modified) (3 diffs)
• RepoAction.java (modified) (4 diffs)

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

@@ -29 +29 @@
 import eu.clarin.cmdi.mdservice.internal.MDTransformer;
 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;
+import eu.clarin.cmdi.mdservice.model.Diagnostic;
 import eu.clarin.cmdi.mdservice.model.Diagnostics;
 import eu.clarin.cmdi.mdservice.proxy.ProxyInterface;
@@ -253 +254 @@
                         sarr[0] = getQ();
                         params.put("q", sarr);          
-                }               
+                }       
+                if (!params.containsKey("repository")){
+                        String[] sarr = new String[1];
+                        sarr[0] = getRepository();
+                        params.put("repository", sarr);
+                }
                 String[] sarr2 = new String[1];
                 sarr2[0] =getFullFormat(); 
                 params.put("fullformat", sarr2);
         }
-
+    
+        
         public Map<String,String[]> getParams() {               
                 return params;
@@ -352 +359 @@
         Map<String, String> aMap = new HashMap<String,String>(); 
         aMap.put("fullformat","format"); 
-        aMap.put("format","fullformat");
+        //aMap.put("format","fullformat");
         aMap.put("columns", "cols");
         aMap.put("maximumItems","maximumItems"); 

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

@@ -75 +75 @@
         private String sort;    
         private int maxdepth;   
-        private String format="xml"; // default no transformation
+        //private String format="xml"; // default no transformation
         private String options;
 
@@ -81 +81 @@
         protected URL base_url ;
 
-        
+        @Override
+        public String getFullFormat() {         
+                return actionkey + "2" + getParam("format");
+        }
         /**
          * Based on the repository type - we create a typed Proxy, that will do the work.
@@ -145 +148 @@
                 this.maxdepth = maxdepth;
         }
-
+/*
         public String getFormat() {
                 return format;
@@ -153 +156 @@
                 this.format = format;
         }
-
+*/
         public String getOptions() {
                 return options;