Changeset 879 for MDService2/trunk/MDService2/src/eu/clarin/cmdi
- Timestamp:
- 11/11/10 22:14:24 (14 years ago)
- Location:
- MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/CompRegistryProxyAction.java
r849 r879 92 92 Admin.notifyUser("CCCRPA." + getFullFormat()); 93 93 MDTransformer.getMDTransformer().setSrcFile(getTargetRequest()); 94 _sourceStream = MDTransformer.getMDTransformer().transformXML(__sourceStream, getFullFormat(),null,null,null,null,null,null); 94 MDTransformer.getMDTransformer().setParams(createTransformerParams()); 95 _sourceStream = MDTransformer.getMDTransformer().transformXML(__sourceStream);//, getFullFormat(),null,null,null,null,null,null); 95 96 Admin.notifyUser("CRPA.- elements"); 96 97 setActionkey("elements"); … … 118 119 // set URL as srcFile (for MDTransformer to pass to xsl-scripts) 119 120 MDTransformer.getMDTransformer().setSrcFile(getTargetRequest()); 120 _resultStream = MDTransformer.getMDTransformer().transformXML(_sourceStream, getFullFormat()); 121 MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap(getFullFormat())); 122 _resultStream = MDTransformer.getMDTransformer().transformXML(_sourceStream);//, getFullFormat()); 121 123 122 124 } -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java
r870 r879 11 11 import java.net.URISyntaxException; 12 12 import java.net.URL; 13 import java.util.HashMap; 13 14 14 15 import javax.servlet.http.HttpServletRequest; … … 367 368 368 369 MDTransformer.getMDTransformer().setSrcFile(file.toURL()); 369 InputStream jsonstream = MDTransformer.getMDTransformer().transformXML(in, "xml2json"); 370 MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap("xml2json")); 371 InputStream jsonstream = MDTransformer.getMDTransformer().transformXML(in); 370 372 371 373 JSONObject json = JSONObject.fromObject(convertStreamToString(jsonstream)); … … 437 439 req_key += duration_d + "//-"; 438 440 return req_key; 441 } 442 443 public HashMap<String,String> createTransformerParams(){ 444 445 HashMap<String,String> hm = new HashMap<String,String>(); 446 447 if (getFullFormat() != null){ 448 hm.put("format", getFullFormat()); 449 } 450 if (getColumns() != null){ 451 hm.put("cols", getColumns()); 452 } 453 if (getStartRecord() != null){ 454 hm.put("startRecord", getStartRecord()); 455 } 456 if (getMaximumRecords() != null){ 457 hm.put("maximumRecords", getMaximumRecords()); 458 } 459 if (getLang() != null){ 460 hm.put("lang", getLang()); 461 } 462 if (getQ() != null){ 463 hm.put("q", getQ()); 464 } 465 if (getRepository() == 0){ 466 hm.put("repository_uri", String.valueOf(getRepository())); 467 } 468 469 return hm; 470 439 471 } 440 472 … … 481 513 // getColumns 482 514 Admin.notifyUser("GPA.getRepository, before xsl:" + getRepository()); 483 resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),String.valueOf(getRepository())); 515 MDTransformer.getMDTransformer().setParams(createTransformerParams()); 516 resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream);//, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),String.valueOf(getRepository())); 484 517 } 485 518 -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericWorkspaceAction.java
r676 r879 181 181 MDTransformer.getMDTransformer().setSrcFile(getURL()); 182 182 //InputStream tmp_s = MDTransformer.getMDTransformer().transformXML(sourceStream, "attr2elements"); 183 InputStream s = MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat()); 183 MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap(getFullFormat())); 184 InputStream s = MDTransformer.getMDTransformer().transformXML(sourceStream);//, getFullFormat()); 184 185 resultStream = getPart(s); 185 186 } -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDTransformer.java
r849 r879 13 13 import java.io.StringWriter; 14 14 import java.net.URL; 15 import java.util.HashMap; 16 import java.util.Iterator; 17 import java.util.Map; 18 import java.util.Set; 15 19 16 20 import javax.xml.parsers.DocumentBuilder; … … 27 31 import javax.xml.transform.stream.StreamSource; 28 32 33 import ognl.IntHashMap.Entry; 34 29 35 import org.w3c.dom.Document; 30 36 import org.w3c.dom.Element; … … 45 51 46 52 private URL srcFile ; 47 53 private HashMap<String,String> params; 48 54 49 55 private static MDTransformer singleton; … … 70 76 } 71 77 78 public void setParams(HashMap<String,String> params){ 79 this.params = params; 80 } 81 82 public HashMap<String,String> getParams(){ 83 return this.params; 84 } 72 85 /** 73 86 * get the path to the transform-xsl file from properties, based on the key … … 156 169 } 157 170 171 public String getTranskey(){ 172 return params.get("format"); 173 } 174 175 public void SetTransformerParameters(Transformer transformer){ 176 177 Set<Map.Entry<String,String>> set = params.entrySet(); 178 Iterator<Map.Entry<String,String>> i = set.iterator(); 179 180 while(i.hasNext()){ 181 Map.Entry<String,String> e = (Map.Entry<String,String>)i.next(); 182 transformer.setParameter((String)e.getKey(), (String)e.getValue()); 183 } 184 } 185 158 186 /** 159 187 * The main method for transforming, applies the appropriate (based on the transkey) stylesheet on the xml-stream … … 164 192 * @throws TransformerException 165 193 * @throws IOException 166 */ 167 public void transformXML (InputStream in, String transkey, String cols, String startRecord, String maximumRecords, String lang, String q, String repositoryURI, OutputStream out ) throws TransformerException, IOException { 194 */ 195 public void transformXML (InputStream in, OutputStream out ) throws TransformerException, IOException { 196 //public void transformXML (InputStream in, String transkey, String cols, String startRecord, String maximumRecords, String lang, String q, String repositoryURI, OutputStream out ) throws TransformerException, IOException { 168 197 169 198 // Create a transform factory instance. … … 175 204 //String xslpath = getXSLPath(transkey); 176 205 Transformer transformer = tfactory.newTransformer( 177 getXSLStreamSource( transkey));178 179 transformer.setParameter("q", q);206 getXSLStreamSource(getTranskey())); 207 SetTransformerParameters(transformer); 208 /* transformer.setParameter("q", q); 180 209 transformer.setParameter("lang", lang); 181 210 transformer.setParameter("format", transkey); … … 190 219 transformer.setParameter("repository_uri", repositoryURI); 191 220 } 221 */ 192 222 /* transformer.setParameter("cols", "<col label='id'>Id</col>" + 193 223 "<col label='id'>idno</col>" + … … 238 268 * @throws TransformerException 239 269 */ 240 public InputStream transformXML ( InputStream xmlStream, String transkey, String cols, String startRecord, String maximumRecords, String lang, String q, String repositoryURI) throws IOException, InterruptedException, TransformerException { 270 public InputStream transformXML ( InputStream xmlStream) throws IOException, InterruptedException, TransformerException { 271 //public InputStream transformXML ( InputStream xmlStream, String transkey, String cols, String startRecord, String maximumRecords, String lang, String q, String repositoryURI) throws IOException, InterruptedException, TransformerException { 241 272 242 273 ByteArrayOutputStream out = new ByteArrayOutputStream(); 243 transformXML(xmlStream, transkey, cols, startRecord, maximumRecords, lang, q, repositoryURI, out); 274 transformXML(xmlStream, out); 275 //transformXML(xmlStream, transkey, cols, startRecord, maximumRecords, lang, q, repositoryURI, out); 244 276 InputStream transformedStream = new ByteArrayInputStream(out.toByteArray()); 245 277 //Admin.notifyUser("transformedStream:" + transformedStream.toString()); … … 256 288 * @throws TransformerException 257 289 */ 290 /* 258 291 public InputStream transformXML ( InputStream xmlStream, String transkey) throws IOException, InterruptedException, TransformerException { 259 292 … … 264 297 return transformedStream; 265 298 } 266 299 */ 267 300 /** 268 301 * another wrapper for the main method allowing to directly pass a URL to the source-xml … … 273 306 * @throws IOException 274 307 */ 275 public InputStream transformXML (URL xmlFile, String transkey ) throws IOException, InterruptedException, TransformerException { 308 public InputStream transformXML (URL xmlFile ) throws IOException, InterruptedException, TransformerException { 309 //public InputStream transformXML (URL xmlFile, String transkey ) throws IOException, InterruptedException, TransformerException { 276 310 srcFile= xmlFile; 277 311 InputStream xmlStream = 278 312 new BufferedInputStream(new FileInputStream(xmlFile.getPath())); 279 313 280 return transformXML ( xmlStream , transkey);314 return transformXML ( xmlStream); 281 315 } 282 316 … … 289 323 * @return 290 324 */ 291 public String transformXML (String xml, String transkey ) { 325 public String transformXML (String xml) { 326 //public String transformXML (String xml, String transkey ) { 292 327 String result=""; 293 328 try { … … 299 334 // Create a transformer for the stylesheet. 300 335 Transformer transformer = tfactory.newTransformer( 301 getXSLStreamSource( transkey));336 getXSLStreamSource(getTranskey())); 302 337 /* instead of: 303 338 InputStream xslIS = … … 307 342 tfactory.newTransformer(new StreamSource(xslIS)); 308 343 */ 309 transformer.setParameter("format", transkey); 344 this.SetTransformerParameters(transformer); 345 //transformer.setParameter("format", transkey); 310 346 311 347 //Admin.notifyUser("transformer.parmformat" + transformer.getParameter("format")); … … 329 365 330 366 331 367 public static HashMap<String,String> createParamsMap(String transkey){ 368 HashMap<String,String> hm = new HashMap<String,String>(); 369 370 if (transkey != null){ 371 hm.put("format", transkey); 372 } 373 return hm; 374 } 332 375 } -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/TermsProxyAction.java
r862 r879 38 38 } 39 39 40 @Override 41 public String getFullFormat() { 42 return "terms2extract"; 43 } 40 44 /* 41 45 @Override … … 125 129 InputStream resultStream=null; 126 130 try { 127 resultStream = MDTransformer.getMDTransformer().transformXML(stream_matrix_all, "terms2extract", getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(), getRepositoryPath()); 131 MDTransformer.getMDTransformer().setParams(createTransformerParams()); 132 resultStream = MDTransformer.getMDTransformer().transformXML(stream_matrix_all);//, "terms2extract", getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(), getRepositoryPath()); 128 133 } catch (InterruptedException e) { 129 134 Admin.notifyUser("TPA.getSourceStream(): "+ e.getMessage()); -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java
r860 r879 273 273 // set srcFile (for MDTransformer to pass to xsl-scripts) 274 274 MDTransformer.getMDTransformer().setSrcFile(getURL()); 275 setResultStream(MDTransformer.getMDTransformer().transformXML(in, getFullFormat())); 275 MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap(getFullFormat())); 276 setResultStream(MDTransformer.getMDTransformer().transformXML(in));//, getFullFormat())); 276 277 //setSessionData(getResultStream()); 277 278 } -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java
r774 r879 393 393 */ 394 394 public String toXPath() { 395 return MDTransformer.getMDTransformer().transformXML(toXCQL(), "XCQL2XPATH"); 395 MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap("XCQL2XPATH")); 396 return MDTransformer.getMDTransformer().transformXML(toXCQL()); 396 397 } 397 398 -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Result.java
r627 r879 58 58 transformkey = parentQuery.getType() + "2" + format; 59 59 Admin.notifyUser("transformkey: " + transformkey ); 60 return MDTransformer.getMDTransformer().transformXML(rawresult, transformkey); 60 MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap(transformkey)); 61 return MDTransformer.getMDTransformer().transformXML(rawresult);//, transformkey); 61 62 } 62 63 }
Note: See TracChangeset
for help on using the changeset viewer.