Changeset 742 for MDService2/trunk/MDService2/src/eu/clarin/cmdi

Timestamp:

10/01/10 14:59:39 (14 years ago)

Author:

vronk

Message:

started IE-browser fixes

Location:

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

Files:

• Admin.java (modified) (4 diffs)
• WorkspaceAction.java (modified) (1 diff)

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

@@ -9 +9 @@
 import java.util.Properties;
 
+import net.sf.json.JSON;
+import net.sf.json.JSONSerializer;
+import net.sf.json.xml.XMLSerializer;
+
 import eu.clarin.cmdi.mdservice.model.Query;
 
@@ -34 +38 @@
                 //System.out.println(cmdreg.listComponents());
 
-                
-                loadConfig(config_path);
-                
-                
+                testJSON();
+                
+                //loadConfig(config_path);
+                
+                /*
                 //Query q = new Query("dc.title=dino or dinosaur", Query.RECORDSET);
                 //Query q = new Query("( ( Date any 2005 ) or ( Date any 2001 ) ) and ( ( Description any part ) )", Query.RECORDSET);
@@ -43 +48 @@
                 //System.out.println(q.toXCQL());
                 System.out.println(q.toXPath());
-                
+                */
                 //Query q = new Query("CMD", "cmdIndex");
                 
@@ -233 +238 @@
         }
 
-
+public static void testJSON() {
+Admin.notifyUser("JSON TEST");
+    String str = "{'name':'JSON','integer':1,'double':2.0,'boolean':true,'nested':{'id':42},'array':[1,2,3]}";
+    Query q = new Query("dc.title=dino or dinosaur", Query.RECORDSET);
+        JSON json = JSONSerializer.toJSON( str);  
+        XMLSerializer xmlSerializer = new XMLSerializer();  
+        String xml = xmlSerializer.write( json ); 
+        Admin.notifyUser(xml);
 }
 
-
+}
+
+

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

@@ -147 +147 @@
             try{
                     url=file.toURL(); 
-                    Admin.notifyUser(" JSON TEST: url "  + url);
+                    Admin.notifyUser("DEBUG: WorkspaceAction.getBaseURL(): "  + url);
             } catch (MalformedURLException e){
                 Admin.notifyUser("JSON exception has been caught" + e);