Changeset 761

Timestamp:

10/08/10 21:47:23 (14 years ago)

Author:

gaba

Message:

 

Location:

MDService2/trunk/MDService2

Files:

• WebContent/scripts/mdservice2_ui.js (modified) (3 diffs)
• src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java (modified) (4 diffs)

MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js

@@ -47 +47 @@
                 }
 
-//////////////                          
+//////////////          
+                //saveWorkspace();
                 loadWorkspaceProfiles();
                 loadCollections();                      
@@ -59 +60 @@
                 addFunctionality();
                 addVisuals();
+                
 });
 
@@ -355 +357 @@
 
         var JSONText = JSON.stringify(jsonw["WorkspaceProfile"]);
-        $.post("/MDService2/workspaceprofilesave/1/" + JSONText, "");
+        //var JSONText = JSON.stringify({"aa.a":"r"});
+        notifyUser(JSONText,'debug');
+        $.get("/MDService2/workspaceprofilesave/",JSONText);
 }
 ////////////////////////////////////////////////

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

@@ -2 +2 @@
 
 import java.io.BufferedInputStream;
+import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Enumeration;
 
 import java.io.StringReader;
 import java.io.StringWriter;
 
+import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.parsers.DocumentBuilder;
@@ -31 +36 @@
 import net.sf.json.xml.XMLSerializer;
 
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+//import javax.servlet.ServletInputStream;
+import org.apache.catalina.connector.CoyoteInputStream;
+import org.apache.catalina.security.SecurityUtil;
+
+
+
 import org.apache.struts2.interceptor.ServletRequestAware;
 import org.w3c.dom.Document;
@@ -66 +80 @@
         
         //private HttpServletRequest request; 
-         
-        public String getData() {
+        
+        public String getData(){
                 return data;
         }
@@ -350 +364 @@
         
 */
-        public String save(){
-                
-        String jsonData = getData();
+        public String save() throws IOException {
+                
+        String jsonData = null ;//= getData();
+              
+     // Extract the post content from the request
+//        ///@SuppressWarnings("unchecked")
+        //Enumeration<String> paramEnum = this.getServletRequest().getParameterNames();
+        //paramEnum.hasMoreElements();
+        //jsonData = (String) paramEnum.nextElement();
+        Admin.notifyUser(this.getServletRequest().getContentType());
+        ServletInputStream sins = this.getServletRequest().getInputStream();
+        sins.reset();
+        int contentLen = this.getServletRequest().getContentLength();
+
+        if ( contentLen >= 1 ) {
+
+                byte buffer[] = new byte[ contentLen ];
+
+                try{
+                        int len = sins.readLine( buffer, 0, buffer.length );
+                        jsonData = new String( buffer, 0, len );
+                }catch (IOException e){
+                        Admin.notifyUser("exception");
+                }
+        }
+
         Admin.notifyUser("JSON data:"+jsonData);