Ignore:
Timestamp:
2011-05-09T14:37:04+12:00 (13 years ago)
Author:
sjm84
Message:

Updating this branch to match the latest Greenstone3 changes

Location:
main/branches/64_bit_Greenstone/greenstone3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/branches/64_bit_Greenstone/greenstone3

  • main/branches/64_bit_Greenstone/greenstone3/src/java/org/greenstone/gsdl3/action/FormatAction.java

    r23606 r24007  
    9797
    9898    try {
    99             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
    100             DocumentBuilder builder = factory.newDocumentBuilder();
     99            //DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
     100            //DocumentBuilder builder = factory.newDocumentBuilder();
    101101            //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 );
    105106            //Node n1 = d.getFirstChild();           
    106107            //Document d2 = (Document) this.doc.importNode(e, true);
    … …  
    111112            XMLTransformer transformer = new XMLTransformer();
    112113            // 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");  /*************************/
    114117
    115118            if(style_doc == null)
    … …  
    117120
    118121            // 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);
    120123            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.xsl
     124            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
    122125
    123126            logger.error("Transform successful?");
    … …  
    125128            if(transformed==null)  // not null
    126129                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());
    127134
    128135            //logger.error("begin import");
    … …  
    134141 
    135142            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));
    138145            //format.setNodeValue(transformed);
    139146            mr_request.appendChild(format);
Note: See TracChangeset for help on using the changeset viewer.