Changeset 1527 for MDService2

Timestamp:

09/08/11 19:14:23 (13 years ago)

Author:

vronk

Message:

addded format-param handling..

Location:

MDService2/branches/MDService_simple3/src

Files:

• eu/clarin/cmdi/mdservice/action/GenericAction.java (modified) (8 diffs)
• eu/clarin/cmdi/mdservice/internal/MDTransformer.java (modified) (2 diffs)
• xsl/cmd_commons.xsl (modified) (1 diff)
• xsl/html_snippets.xsl (modified) (1 diff)

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

@@ -1 +1 @@
 package eu.clarin.cmdi.mdservice.action;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
+
+import javax.servlet.http.HttpServletRequest;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import java.io.ByteArrayInputStream;
-
-import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
 import org.apache.struts2.interceptor.ServletRequestAware;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
 
 import com.opensymphony.xwork2.ActionSupport;
@@ -29 +24 @@
 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.model.WorkspaceProfile;
@@ -57 +51 @@
         private String actionkey = "generic";
         private String q;
+        private String format;
         
         private String actionContentType;
@@ -111 +106 @@
                         this.q = q;
          }
-         
+        
+         public void setFormat(String format) {
+                        //if (q == null) q="";
+                        this.format = format;
+         }
+        
          public String getActionkey() {
                         return actionkey;
@@ -123 +123 @@
                  return getParam("recordPacking");
          }
+         public String getQuery() {
+                 return getParam("query");
+         }
+         public String getStartRecord() {
+                 return getParam("startRecord");
+         }
+         public String getMaximumRecords() {
+                 return getParam("maximumRecords");
+         }
          public String getFormat() {
                         return getParam("x-cmd-format");
@@ -141 +150 @@
                         return getParam("x-cmd-columns");
          }
-         public String getQuery() {
-                 return getParam("query");
-         }
-         public String getStartRecord() {
-                 return getParam("startRecord");
-         }
-         public String getMaximumRecords() {
-                 return getParam("maximumRecords");
-         }
-         public String getMaxdepth() {
+          public String getMaxdepth() {
                  return getParam("x-cmd-maxdepth");
          }
@@ -307 +307 @@
                         addParam("x-cmd-format","xml");
                 }
+
+                addParam("fullformat",getFullFormat());
+                addParam("format",getFormat());
+                
         }
         
@@ -536 +540 @@
                 }
                 
-                
+                log.debug("format: " + getFormat() );
                 if (getFormat().equals("xml")) {                        
                         resultStream = sourceStream;    

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/internal/MDTransformer.java

@@ -131 +131 @@
         
         public String getTranskey(){
-                return params.get("x-cmd-format")[0];
+                //return params.get("x-cmd-format")[0];
+                return params.get("fullformat")[0];
         }
 
@@ -328 +329 @@
                 String[] arrkey = new String[1];
                 arrkey[0] = key;
-                        hm.put("x-cmd-format", arrkey);
+                        hm.put("fullformat", arrkey);                   
             }
             return hm;

MDService2/branches/MDService_simple3/src/xsl/cmd_commons.xsl

@@ -24 +24 @@
 and passes back to the individual stylesheets for the content (via template: continue-root) -->
 <xsl:template match="/">
-        <!--    <xsl:message>root_document-uri:<xsl:value-of select="$root_uri" /></xsl:message>-->             
+        <xsl:message>root_document-uri:<xsl:value-of select="$root_uri" /></xsl:message>                
+        <xsl:message>format:<xsl:value-of select="$format" /></xsl:message>
                 <xsl:choose>                    
                 <xsl:when test="contains($format,'htmlpage')" >

MDService2/branches/MDService_simple3/src/xsl/html_snippets.xsl

@@ -73 +73 @@
                 <div class="header ui-widget-header ui-state-default ui-corner-top" ><span>Search</span></div>
                 <div class="content" id="query-input" >         
-                        <form action="{my:formURL('recordset', 'htmlsimple','')}" method="get">                                                 
+                        <form action="{my:formURL('search', 'htmlpage','')}" method="get">                                                      
                                 <input type="text" id="input-simplequery" name="squery"/>
                                 <input type="submit"  value="submit" id="submit-query"/>