Changeset 18473 for greenstone3

Timestamp:

2009-02-09T13:22:19+13:00 (15 years ago)

Author:

max

Message:

Change back the way all postProcessing works in order to get the GSF statements working again, until we find another solution.

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (3 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -211 +211 @@
             return page;
         }
-        
+        /*
         // put the page into a document - this is necessary for xslt to get
         // the paths right if you have paths relative to the document root
@@ -261 +261 @@
             logger.debug(this.converter.getPrettyString(style_doc.getDocumentElement()));
         }
+        */
         //for debug purposes only
         Document oldStyle_doc = style_doc;
@@ -344 +345 @@
             System.out.println("Error while preprocessing the skin xslt") ;
             return XMLTransformer.constructErrorXHTMLPage(e.getMessage()) ;
+        }
+    
+            // put the page into a document - this is necessary for xslt to get
+        // the paths right if you have paths relative to the document root
+        // eg /page.
+        Document doc = this.converter.newDOM();
+        doc.appendChild(doc.importNode(page, true));
+        Element page_response = (Element)GSXML.getChildByTagName(page, GSXML.PAGE_RESPONSE_ELEM);
+        Element format_elem = (Element)GSXML.getChildByTagName(page_response, GSXML.FORMAT_ELEM);
+        if (output.equals("formatelem")) {
+            return format_elem;
+        }
+        if (format_elem != null) {
+            //page_response.removeChild(format_elem);
+            logger.debug("format elem="+this.converter.getPrettyString(format_elem));
+            // need to transform the format info
+            String configStylesheet_file = GSFile.stylesheetFile(GlobalProperties.getGSDL3Home(), (String)this.config_params.get(GSConstants.SITE_NAME), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces,   "config_format.xsl");
+            Document configStylesheet_doc = this.converter.getDOM(new File(configStylesheet_file));
+            if (configStylesheet_doc != null) {
+                Document format_doc = this.converter.newDOM();
+                format_doc.appendChild(format_doc.importNode(format_elem, true));
+                Node result = this.transformer.transform(configStylesheet_doc, format_doc);
+                
+                // Since we started creating documents with DocTypes, we can end up with 
+                // Document objects here. But we will be working with an Element instead, 
+                // so we grab the DocumentElement() of the Document object in such a case.
+                Element new_format;
+                if(result.getNodeType() == Node.DOCUMENT_NODE) {
+                    new_format = ((Document)result).getDocumentElement();
+                } else {
+                    new_format = (Element)result;
+                }
+                logger.debug("new format elem="+this.converter.getPrettyString(new_format));
+                if (output.equals("newformat")) {
+                    return new_format;
+                }
+                
+                // add extracted GSF statements in to the main stylesheet
+                GSXSLT.mergeStylesheets(skinAndLibraryDoc, new_format);
+                //System.out.println("added extracted GSF statements into the main stylesheet") ;
+                
+                // add extracted GSF statements in to the debug test stylesheet
+                //GSXSLT.mergeStylesheets(oldStyle_doc, new_format);
+            } else {
+                logger.error(" couldn't parse the config_format stylesheet, adding the format info as is");
+                GSXSLT.mergeStylesheets(skinAndLibraryDoc, format_elem);
+            //  GSXSLT.mergeStylesheets(oldStyle_doc, format_elem);
+            }
+            logger.debug("the converted stylesheet is:");
+            logger.debug(this.converter.getPrettyString(skinAndLibraryDoc.getDocumentElement()));
         }