Changeset 1429 for MDService2/trunk/MDService2/src/eu

Timestamp:

06/21/11 19:30:01 (13 years ago)

Author:

gaba

Message:

logging <xsl:message> solution
options withSummary - changes

Location:

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

Files:

• action/Admin.java (modified) (2 diffs)
• action/GenericProxyAction.java (modified) (2 diffs)
• action/MDTransformer.java (modified) (12 diffs)
• model/Query.java (modified) (6 diffs)

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

@@ -45 +45 @@
         public static String DEBUG = "debug";
         public static String TRACE = "trace";
+        
         
         public static void main(String[] args) {                
@@ -234 +235 @@
         public static void notifyUser(String msg, String type ) {
                 //Logger log = Logger.getLogger("Admin.class");
+                if (msg.length() == 0){
+                        return;
+                }
                 if (type.equals(Admin.FATAL)) {
                         log.fatal(msg);

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

@@ -21 +21 @@
 import net.sf.json.JSONObject;
 import net.sf.json.JSONSerializer;
+//import net.sf.saxon.Controller;
+//import net.sf.saxon.event.MessageEmitter;
 
 
@@ -608 +610 @@
                 //      Admin.notifyUser("GPA.getRepository, before xsl:" + getRepository());
                         transformer.setParams(createTransformerParams());
+                        
                         resultStream = transformer.transformXML(sourceStream);//, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),String.valueOf(getRepository()));
                 }

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

@@ -2 +2 @@
 
 import java.io.BufferedInputStream;
+import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -8 +9 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.io.Writer;
 import java.net.URL;
 import java.util.HashMap;
@@ -21 +24 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+//import javax.xml.transform.ErrorListener;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
@@ -31 +35 @@
 import javax.xml.transform.stream.StreamSource;
 
-import ognl.IntHashMap.Entry;
+//import ognl.IntHashMap.Entry;
+
+import net.sf.saxon.event.MessageEmitter;
+import net.sf.saxon.event.MessageWarner;
 
 import org.w3c.dom.Document;
@@ -37 +44 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+
+//import com.icl.saxon.*;
+//import com.icl.saxon.FeatureKeys;
+//import com.icl.saxon.Loader;
+//import com.icl.saxon.output.Emitter;
+
 
 /**
@@ -197 +210 @@
         //public void transformXML (InputStream in, String transkey, String cols, String startRecord, String maximumRecords, String lang, String q, String repositoryURI, OutputStream out ) throws TransformerException, IOException {
         
+                        System.setProperty("javax.xml.transform.TransformerFactory", "net.sf.saxon.TransformerFactoryImpl");
                 // Create a transform factory instance.
                 TransformerFactory tfactory = TransformerFactory.newInstance();
@@ -207 +221 @@
                                                                         getXSLStreamSource(getTranskey()));
                 SetTransformerParameters(transformer);
+                
+                //MessageWarner gg = new net.sf.saxon.event.MessageWarner();
+                MessageEmitter me = new net.sf.saxon.event.MessageEmitter();
+                StringWriter w = new StringWriter();
+                me.setWriter(w);
+               ((net.sf.saxon.Controller)transformer).setMessageEmitter(me);//new net.sf.saxon.event.MessageWarner());
+               
 /*              transformer.setParameter("q", q);
                 transformer.setParameter("lang", lang);
@@ -258 +279 @@
                 // Transform the source XML to out-stream
                 transformer.transform(src, stream );
+                
+                // Write <xsl:message>
+                writeXslMessages(w);
+                ///Admin.notifyUser(w.getBuffer().toString());          
             }
         
+        private void writeXslMessages(StringWriter w){
+        
+        byte[] bytes = w.getBuffer().toString().getBytes();
+        InputStream is =  new ByteArrayInputStream(bytes);
+        BufferedReader br = new BufferedReader(new InputStreamReader(is));
+        String s;
+                try {
+                        while ((s = br.readLine()) != null){
+                        Admin.notifyUser(s);
+                }
+                } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+
+        }
         /**
          * just a wrapper for the main method translating the output-stream into a input-stream (expected by the Controller-Actions to return as response)
@@ -323 +364 @@
          * @param transkey 
          * @return
+         * @throws IOException 
          */
         public String transformXML (String xml) {
@@ -330 +372 @@
                 // Create a transform factory instance.
                         System.setProperty("javax.xml.transform.TransformerFactory", "net.sf.saxon.TransformerFactoryImpl");
+                        //System.setProperty("javax.xml.transform.TransformerFactory", "com.icl.saxon.TransformerFactoryImpl");
                 TransformerFactory tfactory = TransformerFactory.newInstance();
                 OutputStream os = new ByteArrayOutputStream();
@@ -343 +386 @@
                     tfactory.newTransformer(new StreamSource(xslIS));
                     */
-                this.SetTransformerParameters(transformer);
-                //transformer.setParameter("format", transkey);
-                
-                //Admin.notifyUser("transformer.parmformat" + transformer.getParameter("format"));
+                ////////////////////
+                MessageEmitter me = new net.sf.saxon.event.MessageEmitter();
+                StringWriter w = new StringWriter();
+                me.setWriter(w);
+                ((net.sf.saxon.Controller)transformer).setMessageEmitter(me);//new net.sf.saxon.event.MessageWarner());
 
                 // Transform the source XML to System.out.
@@ -355 +399 @@
                 transformer.transform(src, stream );
                                     //  new StreamResult(new File("Simple2.out")));
-                
+             // Write <xsl:message>
+                writeXslMessages(w);
+                  
                 result = os.toString(); 
                 

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java

@@ -83 +83 @@
         public Query(String squeryString,String queryString, String type, String collection, String columns) {
                 this.type =type;
+                if (squeryString == null)squeryString ="";
+                if (queryString == null)queryString ="";
                 setFullQueryString(squeryString, queryString);
                 setCollection(collection);
@@ -96 +98 @@
 
         public Query(String squeryString, String queryString, String type, String collection) {
-                this.type =type;
-                setFullQueryString(squeryString, queryString);
-                setCollection(collection);
+                //this.type =type;
+                //setFullQueryString(squeryString, queryString);
+                //setCollection(collection);
+                this(squeryString, queryString, type, collection, "Id,name");
         }
 
@@ -109 +112 @@
 
         public Query(String squeryString, String queryString, String type) {
-                this.type =type;
-                if (squeryString == null)squeryString =""; 
-                setFullQueryString(squeryString, queryString);
+                //this.type =type;
+                //if (squeryString == null)squeryString =""; 
+                //setFullQueryString(squeryString, queryString);
+                this(squeryString, queryString, type, "");
         }
 
@@ -225 +229 @@
         public void setStartItem(String startItem) {
                 if (startItem!=null) {
-                        this.startItem = startItem;
+                        if (startItem.equals("")){
+                                // sets default startItem
+                                this.startItem = "1";
+                        }else {
+                                this.startItem = startItem;
+                        }
                 }
         }
@@ -235 +244 @@
         public void setMaximumItems(String maximumItems) {
                 if (maximumItems!=null) {
-                        this.maximumItems = maximumItems;
+                        if (maximumItems.equals("")){
+                                this.maximumItems = "50";
+                        } else {
+                                this.maximumItems = maximumItems;       
+                        }
                 }
         }
@@ -433 +446 @@
          * applying a stylesheet on the XCQL-version  
          * @return XPath-query
+         * @throws IOException 
          */
         public String toXPath() {