Changeset 762 for MDService2/trunk/MDService2/src/eu
- Timestamp:
- 10/09/10 21:32:29 (14 years ago)
- Location:
- MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Cache.java
r745 r762 193 193 if (str.trim().length() == 0) return ""; 194 194 195 query = new Query( "", str,"recordset","");195 query = new Query(null, str,"recordset",""); 196 196 if (query.isStatus(Query.PARSEERROR)) { 197 197 Admin.notifyUser("Cache.transformQuery.PARSEERROR:" + query.getMsg()); -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java
r745 r762 47 47 48 48 public void setQ(String q) { 49 if (q != null){ 50 if (q.trim().length() == 0){ 51 q = null; 52 } 53 } 49 54 this.q = q; 50 55 } … … 268 273 269 274 Admin.notifyUser("session-attrs:"); 270 Admin.notifyUser(getServletRequest().getRemoteUser() );275 Admin.notifyUser(getServletRequest().getRemoteUser() ); 271 276 //Admin.notifyUser(String.valueOf(getSession())); 272 277 273 278 prepare(); 274 279 if (resultStream == null) { -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java
r761 r762 180 180 String profilename = null; 181 181 182 //Admin.notifyUser("QQQremoteUSER:" + USER);183 //Admin.notifyUser("QQQremoteUSER:" + getServletRequest().getRemoteUser());184 182 if (type.toLowerCase().equals(USER)) { 185 //Admin.notifyUser("WWWaaaremoteUSER:" + getServletRequest().getRemoteUser());186 183 if (getServletRequest().getRemoteUser() != null) { 187 //Admin.notifyUser("WWWremoteUSER:" + getServletRequest().getRemoteUser());188 184 profilename = "WorkspaceProfile_" + getServletRequest().getRemoteUser() + ".xml"; 189 185 } else { … … 268 264 } 269 265 270 /* 271 public String save(){ 266 public String save() throws IOException { 272 267 273 268 String jsonData = getData(); 274 Admin.notifyUser("JSON data:"+jsonData);275 276 resultStream = null;277 278 XMLSerializer serializer = new XMLSerializer();279 JSON json = JSONSerializer.toJSON( jsonData );280 //Admin.notifyUser("test5");281 serializer.setRootName("WorkspaceProfile");282 serializer.setTypeHintsEnabled(false);283 284 String xml = serializer.write( json );285 Admin.notifyUser("XML:" + xml);286 287 288 DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();289 DocumentBuilder builder;290 try {291 builder = factory.newDocumentBuilder();292 try {293 Document document = builder.parse(new InputSource(new StringReader(xml)));294 NodeList list = document.getElementsByTagName("e");295 Admin.notifyUser("list:" + list.getLength());296 while (list.getLength() > 0){297 Admin.notifyUser(0 + "::" + list.item(0).getNodeName() + "::" + list.item(0).getParentNode().getNodeName());298 if (list.item(0).getParentNode().getNodeName().equals("Queries")){299 changeNodeName(document, list.item(0),"Query");300 }else{301 if (list.item(0).getParentNode().getNodeName().equals("Querysets")){302 changeNodeName(document, list.item(0),"Queryset");303 } else{304 if (list.item(0).getParentNode().getNodeName().equals("collections")){305 changeNodeName(document, list.item(0),"item");306 } else {307 if (list.item(0).getParentNode().getNodeName().equals("columns")){308 changeNodeName(document, list.item(0),"col");309 }310 }311 }312 }313 list = document.getElementsByTagName("e");314 }315 316 Transformer transformer;317 try {318 transformer = TransformerFactory.newInstance().newTransformer();319 transformer.setOutputProperty(OutputKeys.INDENT, "yes");320 StreamResult result = new StreamResult(new StringWriter());321 DOMSource source = new DOMSource(document);322 try {323 transformer.transform(source, result);324 String xmlString = result.getWriter().toString();325 326 Admin.notifyUser("XML:" + xmlString);327 328 InputStream is_xml = new ByteArrayInputStream( xmlString.getBytes( ) );329 Admin.writeToFile(getPath(), is_xml);330 331 } catch (TransformerException e1) {332 // TODO Auto-generated catch block333 e1.printStackTrace();334 }335 336 337 338 } catch (TransformerConfigurationException e) {339 // TODO Auto-generated catch block340 e.printStackTrace();341 } catch (TransformerFactoryConfigurationError e) {342 // TODO Auto-generated catch block343 e.printStackTrace();344 }345 346 } catch (SAXException e) {347 // TODO Auto-generated catch block348 e.printStackTrace();349 } catch (IOException e) {350 // TODO Auto-generated catch block351 e.printStackTrace();352 }353 } catch (ParserConfigurationException e) {354 // TODO Auto-generated catch block355 e.printStackTrace();356 }357 358 String ret = "1";359 resultStream = new ByteArrayInputStream(ret.getBytes());360 361 362 return SUCCESS;363 }364 365 */366 public String save() throws IOException {367 368 String jsonData = null ;//= getData();369 269 370 // Extract the post content from the request371 // ///@SuppressWarnings("unchecked")372 //Enumeration<String> paramEnum = this.getServletRequest().getParameterNames();373 //paramEnum.hasMoreElements();374 //jsonData = (String) paramEnum.nextElement();375 Admin.notifyUser(this.getServletRequest().getContentType());376 ServletInputStream sins = this.getServletRequest().getInputStream();377 sins.reset();378 int contentLen = this.getServletRequest().getContentLength();379 380 if ( contentLen >= 1 ) {381 382 byte buffer[] = new byte[ contentLen ];383 384 try{385 int len = sins.readLine( buffer, 0, buffer.length );386 jsonData = new String( buffer, 0, len );387 }catch (IOException e){388 Admin.notifyUser("exception");389 }390 }391 392 270 Admin.notifyUser("JSON data:"+jsonData); 393 271 … … 411 289 } 412 290 413 /**414 * default Action method415 */416 /*417 public String execute() throws Exception {418 419 prepare();420 if (resultStream == null) {421 return ERROR;422 } else {423 return SUCCESS;424 }425 }426 */427 428 291 429 292 } -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java
r748 r762 134 134 135 135 public void setQueryString(String squeryString, String queryString) { 136 /* 136 137 if (squeryString.trim().length() == 0){ 137 138 squeryString = null; … … 140 141 queryString = null; 141 142 } 143 */ 142 144 String squery = createsqueryString(squeryString); 143 145 if (squery != null && queryString != null){
Note: See TracChangeset
for help on using the changeset viewer.