Changeset 627 for MDService2/trunk/MDService2/src/eu/clarin/cmdi
- Timestamp:
- 08/17/10 13:43:01 (14 years ago)
- Location:
- MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Admin.java
r466 r627 2 2 3 3 import java.io.File; 4 import java.io.FileInputStream;5 4 import java.io.FileNotFoundException; 6 5 import java.io.FileOutputStream; … … 10 9 import java.util.Properties; 11 10 12 import com.opensymphony.oscache.base.NeedsRefreshException;13 import com.opensymphony.oscache.general.GeneralCacheAdministrator;14 15 11 import eu.clarin.cmdi.mdservice.model.Query; 16 import eu.clarin.cmdi.mdservice.model.Result;17 12 18 13 /** … … 43 38 44 39 45 //Query q = new Query("dc.title=dino or dinosaur"); 46 //System.out.println(q.toXPath()); 40 //Query q = new Query("dc.title=dino or dinosaur", Query.RECORDSET); 41 //Query q = new Query("( ( Date any 2005 ) or ( Date any 2001 ) ) and ( ( Description any part ) )", Query.RECORDSET); 42 Query q = new Query("( ( Date any 2005 ) or ( Country = \"United States\" ) ) and ( ( Description any part ) )", Query.RECORDSET); 43 //System.out.println(q.toXCQL()); 44 System.out.println(q.toXPath()); 47 45 48 46 //Query q = new Query("CMD", "cmdIndex"); -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/CollectionProxyAction.java
r526 r627 2 2 3 3 import java.io.IOException; 4 import java.io.InputStream;5 import java.net.MalformedURLException;6 4 import java.net.URL; 7 import java.net.URLConnection;8 9 import com.opensymphony.xwork2.ActionSupport;10 5 11 6 /** -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/CompRegistryProxyAction.java
r614 r627 1 1 package eu.clarin.cmdi.mdservice.action; 2 2 3 import java.io.File;4 import java.io.FileOutputStream;5 3 import java.io.IOException; 6 4 import java.io.InputStream; 7 import java.io.OutputStream;8 import java.net.MalformedURLException;9 5 import java.net.URL; 10 import java.net.URLConnection;11 12 import com.opensymphony.xwork2.ActionSupport;13 6 14 7 /** -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java
r582 r627 6 6 import java.net.URL; 7 7 8 import javax.servlet.http.HttpServletRequest; 9 import org.apache.struts2.interceptor.ServletRequestAware; 10 8 11 import com.opensymphony.xwork2.ActionSupport; 9 10 import eu.clarin.cmdi.mdservice.action.MDTransformer;11 12 12 13 /** … … 18 19 * 19 20 */ 20 public class GenericProxyAction extends ActionSupport { 21 public class GenericProxyAction extends ActionSupport 22 implements ServletRequestAware 23 { 21 24 22 25 private static final long serialVersionUID = 1L; … … 31 34 private String format; 32 35 private String userMsg; 36 //private Map<String,Object> session; 37 private HttpServletRequest request; 33 38 34 39 public String getQ() { … … 94 99 } 95 100 101 @Override 102 public void setServletRequest(HttpServletRequest arg0) { 103 request = arg0; 104 } 105 106 public HttpServletRequest getServletRequest() { 107 return request; 108 } 96 109 97 110 … … 191 204 */ 192 205 public String execute() throws Exception { 206 // HttpServletRequest request = ServletActionContext.getRequest(); 207 193 208 209 Admin.notifyUser("session-attrs:"); 210 Admin.notifyUser(getServletRequest().getRemoteUser() ); 211 //Admin.notifyUser(String.valueOf(getSession())); 212 194 213 prepare(); 195 214 if (resultStream == null) { … … 200 219 } 201 220 221 202 222 } -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Helpers.java
r466 r627 5 5 import java.io.OutputStream; 6 6 import java.io.PrintStream; 7 8 7 9 8 import javax.xml.parsers.DocumentBuilder; -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDRepoProxyAction.java
r595 r627 1 1 package eu.clarin.cmdi.mdservice.action; 2 2 3 import java.io.ByteArrayInputStream;4 3 import java.io.IOException; 5 import java.io.InputStream;6 4 import java.net.URL; 7 5 import java.util.HashMap; 8 6 9 import com.opensymphony.xwork2.ActionSupport;10 11 7 import eu.clarin.cmdi.mdservice.model.Query; 12 import eu.clarin.cmdi.mdservice.model.Result;13 8 14 9 /** -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDTransformer.java
r582 r627 1 1 package eu.clarin.cmdi.mdservice.action; 2 2 3 import eu.clarin.cmdi.mdservice.action.Helpers;4 3 import java.io.BufferedInputStream; 5 4 import java.io.ByteArrayInputStream; … … 7 6 import java.io.File; 8 7 import java.io.FileInputStream; 9 import java.io.FileNotFoundException;10 8 import java.io.IOException; 11 9 import java.io.InputStream; … … 13 11 import java.io.Reader; 14 12 import java.io.StringReader; 15 import java.net.MalformedURLException;16 13 import java.net.URL; 17 14 -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java
r620 r627 14 14 import java.net.MalformedURLException; 15 15 import java.net.URL; 16 import java.util.Hashtable; 17 import java.util.Map; 18 19 import org.w3c.dom.*; 20 import javax.xml.parsers.*; 21 22 import org.xml.sax.SAXException; 16 17 import javax.xml.parsers.DocumentBuilder; 18 import javax.xml.parsers.DocumentBuilderFactory; 19 20 import org.w3c.dom.Document; 21 import org.z3950.zing.cql.CQLNode; 23 22 import org.z3950.zing.cql.CQLParseException; 24 23 import org.z3950.zing.cql.CQLParser; 25 import org.z3950.zing.cql.CQLNode;26 24 27 25 import eu.clarin.cmdi.mdservice.action.Admin; -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Result.java
r466 r627 1 1 package eu.clarin.cmdi.mdservice.model; 2 2 3 import java.io.ByteArrayInputStream;4 import java.io.ByteArrayOutputStream;5 3 import java.io.IOException; 6 4 import java.io.InputStream; 7 import java.io.OutputStream;8 5 9 6 import javax.xml.transform.TransformerException; 10 7 11 8 import eu.clarin.cmdi.mdservice.action.Admin; 12 import eu.clarin.cmdi.mdservice.action.Helpers;13 9 import eu.clarin.cmdi.mdservice.action.MDTransformer; 14 10 -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/SearchClause.java
r615 r627 5 5 */ 6 6 7 import java.io.IOException;8 import java.net.MalformedURLException;9 import java.net.URL;10 import java.util.Hashtable;11 import java.util.Map;12 13 import org.w3c.dom.*;14 import javax.xml.parsers.*;15 16 import org.xml.sax.SAXException;17 18 import eu.clarin.cmdi.mdservice.action.Admin;19 7 20 8 -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/SearchClauses.java
r615 r627 1 1 package eu.clarin.cmdi.mdservice.model; 2 2 3 import java.io.IOException; 4 import java.net.MalformedURLException; 5 6 import org.xml.sax.SAXException; 7 import java.io.*; 8 //DOM classes. 9 import org.w3c.dom.*; 10 3 import java.io.StringWriter; 4 5 import javax.xml.transform.OutputKeys; 6 import javax.xml.transform.Transformer; 7 import javax.xml.transform.TransformerConfigurationException; 8 import javax.xml.transform.TransformerException; 9 import javax.xml.transform.TransformerFactory; 10 import javax.xml.transform.dom.DOMSource; 11 import javax.xml.transform.stream.StreamResult; 12 13 import org.w3c.dom.Document; 14 import org.w3c.dom.Element; 15 import org.w3c.dom.Node; 16 import org.w3c.dom.NodeList; 17 18 import eu.clarin.cmdi.mdservice.action.Admin; 11 19 import eu.clarin.cmdi.mdservice.action.DCRProxyAction; 12 //JAXP 1.113 import javax.xml.parsers.*;14 import javax.xml.transform.*;15 import javax.xml.transform.stream.*;16 import javax.xml.transform.dom.*;17 18 import eu.clarin.cmdi.mdservice.action.Admin;19 import eu.clarin.cmdi.mdservice.action.MDTransformer;20 20 21 21
Note: See TracChangeset
for help on using the changeset viewer.