Changeset 1529 for MDService2

Timestamp:

09/09/11 14:26:27 (13 years ago)

Author:

gaba

Message:

workspaceprofile - format added

Location:

MDService2/branches/MDService_simple3/src

Files:

• eu/clarin/cmdi/mdservice/action/WorkspaceAction.java (modified) (2 diffs)
• struts.xml (modified) (2 diffs)

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

@@ -198 +198 @@
         }
 
+        @Override
+        public String getActionContentType() {
+                if (this.getFormat().toLowerCase().startsWith("json")) {
+                        this.setActionContentType("application/json");          
+                        //this.actionContentType = "application/xhtml+xml";
+                } else {
+                        this.setActionContentType("text/xml");  
+                }
+                
+                return getActionContentType();
+        }
         
         //@Override
@@ -962 +973 @@
         public void prepare() throws Exception {                
                 
+                loadParams();
+                
                 NodeList list = (NodeList) getWorkspace();//result;
                 if (list.getLength() < 1) {

MDService2/branches/MDService_simple3/src/struts.xml

@@ -179 +179 @@
 
 <!-- SPECIAL ACTIONS - Workspace(save), VirtualCollection(publish), Admin(cache) --> 
-                <action name="workspaceprofile/*" class="eu.clarin.cmdi.mdservice.action.WorkspaceAction" method="execute">
-                           <param name="format">JSON</param>
-                           <param name="type">{1}</param> 
+                <action name="workspaceprofile/*/*" class="eu.clarin.cmdi.mdservice.action.WorkspaceAction" method="execute">
+                           <!-- <param name="format">JSON</param> -->
+                           <param name="format">{1}</param>
+                           <param name="type">{2}</param> 
                            <!-- + workspace, queryset or as params
                            <param name="workspace">{2}</param>
@@ -188 +189 @@
                            <param name="actionkey"></param>
                             <result type="stream">                         
-                                <param name="contentType">application/json</param>
+                                <!-- <param name="contentType">application/json</param> -->
+                                <param name="contentType">${getActionContentType()}</param>
                                 <param name="inputName">resultStream</param>                            
                             </result>