Changeset 23633 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3
- Timestamp:
- 2011-01-25T15:35:24+13:00 (13 years ago)
- Location:
- main/trunk/greenstone3/src/java/org/greenstone/gsdl3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/FormatAction.java
r23551 r23633 97 97 98 98 try { 99 DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();100 DocumentBuilder builder = factory.newDocumentBuilder();99 //DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); 100 //DocumentBuilder builder = factory.newDocumentBuilder(); 101 101 //String input = "<html><head><title></title></head><body>" + format_string + "</body></html>"; 102 String input = format_string; 103 InputSource is = new InputSource( new StringReader( input ) ); 104 Document d = (Document) builder.parse( is ); 102 //String input = format_string; 103 //InputSource is = new InputSource( new StringReader( input ) ); 104 //Document d = (Document) builder.parse( is ); 105 Document d = this.converter.getDOM(format_string); //(Document) builder.parse( is ); 105 106 //Node n1 = d.getFirstChild(); 106 107 //Document d2 = (Document) this.doc.importNode(e, true); … … 111 112 XMLTransformer transformer = new XMLTransformer(); 112 113 // HOW DO I DO THIS PROPERLY? 113 Document style_doc = this.converter.getDOM(new File("/home/sam/greenstone3/web/interfaces/oran/transform/formatString.xsl"), "UTF-8"); 114 //String style = stylesheetFile(String gsdl3_home, String site_name, String collection, String interface_name, ArrayList base_interfaces, String filename); 115 //Document style_doc = this.converter.getDOM(new File(style), "UTF-8"); //"/home/sam/greenstone3/web/interfaces/oran/transform/formatString.xsl"), "UTF-8"); /*************************/ 116 Document style_doc = this.converter.getDOM(new File("/home/sam/greenstone3/web/interfaces/oran/transform/formatString.xsl"), "UTF-8"); /*************************/ 114 117 115 118 if(style_doc == null) … … 117 120 118 121 // not sure what to do here - some code from Transforming Receptionist 119 String transformed = transformer.transformToString(style_doc, d);122 //String transformed = transformer.transformToString(style_doc, d); 120 123 logger.error("About to transform"); 121 //Node transformed = (Node) transformer.transform(style_doc, d); // Failing org.w3c.dom.DOMException: HIERARCHY_REQUEST_ERR: An attempt was made to insert a node where it is not permitted. ; SystemID: file:///home/sam/greenstone3/packages/tomcat/bin/dummy.xsl124 Node transformed = (Node) transformer.transform(style_doc, d); // Failing org.w3c.dom.DOMException: HIERARCHY_REQUEST_ERR: An attempt was made to insert a node where it is not permitted. ; SystemID: file:///home/sam/greenstone3/packages/tomcat/bin/dummy.xsl 122 125 123 126 logger.error("Transform successful?"); … … 125 128 if(transformed==null) // not null 126 129 logger.error("TRANSFORMED IS NULL"); 130 131 if(transformed.getNodeType() == Node.DOCUMENT_NODE) 132 transformed = ((Document)transformed).getDocumentElement(); 133 logger.error("Node type: "+transformed.getNodeType()); 127 134 128 135 //logger.error("begin import"); … … 134 141 135 142 Element format = this.doc.createElement(GSXML.FORMAT_STRING_ELEM); 136 GSXML.setNodeText(format, transformed);137 //format.appendChild(transformed);143 //GSXML.setNodeText(format, transformed); 144 format.appendChild(this.doc.importNode(transformed,true)); 138 145 //format.setNodeValue(transformed); 139 146 mr_request.appendChild(format); -
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java
r23551 r23633 338 338 339 339 Element format_element = (Element) GSXML.getChildByTagName(request, GSXML.FORMAT_STRING_ELEM); 340 String format_string = GSXML.getNodeText(format_element);341 //Element format_statement = (Element) format_element.getFirstChild();340 //String format_string = GSXML.getNodeText(format_element); 341 Element format_statement = (Element) format_element.getFirstChild(); 342 342 343 343 //logger.error("Format string: " + format_string); … … 394 394 395 395 // Write format statement 396 //String format_string =GSXML.xmlNodeToString(format_statement);396 String format_string = this.converter.getString(format_statement); //GSXML.xmlNodeToString(format_statement); 397 397 writer = new BufferedWriter(new FileWriter(format_statement_filename)); 398 398 writer.write(format_string); … … 416 416 417 417 // Convert format string to a document 418 DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();419 DocumentBuilder builder = factory.newDocumentBuilder();418 //DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); 419 //DocumentBuilder builder = factory.newDocumentBuilder(); 420 420 //String input = "<html><head><title></title></head><body>" + format_string + "</body></html>"; 421 String input = format_string.substring(0,format_string.length()-1)+"</xml>";422 logger.error(input);423 InputSource is = new InputSource( new StringReader( input ) );424 logger.error("About to parse format string");425 Document format_statement = (Document) builder.parse( is );426 logger.error("Done parsing format string");421 //String input = format_string.substring(0,format_string.length()-1)+"</xml>"; 422 //logger.error(input); 423 //InputSource is = new InputSource( new StringReader( input ) ); 424 //logger.error("About to parse format string"); 425 //Document format_statement = (Document) builder.parse( is ); 426 //logger.error("Done parsing format string"); 427 427 428 428 // open collectionConfig.xml and read in to w3 Document … … 488 488 489 489 // append new but we have a string! 490 GSXML.setNodeText(elem, format_string); 491 492 //current_node_list = format_statement.getChildNodes(); 493 //for(k=0; k<current_node_list.getLength(); k++) 494 //{ 495 // current_node = elem.appendChild(current_node_list.item(k)); 496 //} 490 //GSXML.setNodeText(elem, "THIS IS A TEST"); 491 //GSXML.setNodeText(elem, format_string); 492 493 current_node_list = format_statement.getChildNodes(); 494 for(k=0; k<current_node_list.getLength(); k++) 495 { 496 //if(transformed.getNodeType() == Node.DOCUMENT_NODE) 497 //transformed = ((Document)transformed).getDocumentElement(); 498 logger.error("Node type: "+current_node_list.item(k).getNodeType()); 499 if(current_node_list.item(k).getNodeType() != Node.PROCESSING_INSTRUCTION_NODE) 500 current_node = elem.appendChild(this.doc.importNode(current_node_list.item(k),true)); 501 } 497 502 498 503 //String text = GSXML.getNodeText(elem); … … 503 508 504 509 // Now convert config document to string for writing to file 505 String new_config = GSXML.xmlNodeToString(config);510 String new_config = this.converter.getString(config); 506 511 507 512 // Write to file (not original! for now)
Note:
See TracChangeset
for help on using the changeset viewer.