Ignore:
Timestamp:
2005-05-16T11:02:50+12:00 (19 years ago)
Author:
kjdon
Message:

merged from branch ant-install-branch: merge 1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

    r9405 r9874  
    5252        return false;
    5353    }
    54    
    55     Element config_doc = this.converter.getDOM(interface_config_file, "utf-8").getDocumentElement();
    56     String base_interface = config_doc.getAttribute("baseInterface");
     54    Document config_doc = this.converter.getDOM(interface_config_file, "utf-8");
     55    if (config_doc == null) {
     56        System.err.println("TransformingReceptionist: could not parse interface config file: "+interface_config_file.getPath());
     57        return false;
     58    }
     59    Element config_elem = config_doc.getDocumentElement();
     60    String base_interface = config_elem.getAttribute("baseInterface");
    5761    setUpBaseInterface(base_interface);
    58     setUpInterfaceOptions(config_doc);
    59 
    60     Element action_list = (Element)GSXML.getChildByTagName(config_doc, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
     62    setUpInterfaceOptions(config_elem);
     63
     64    Element action_list = (Element)GSXML.getChildByTagName(config_elem, GSXML.ACTION_ELEM+GSXML.LIST_MODIFIER);
    6165    NodeList actions = action_list.getElementsByTagName(GSXML.ACTION_ELEM);
    6266
     
    97101       
    98102    }
    99     Element lang_list = (Element)GSXML.getChildByTagName(config_doc, "languageList");
     103    Element lang_list = (Element)GSXML.getChildByTagName(config_elem, "languageList");
    100104    if (lang_list == null) {
    101105        System.err.println("TransformingReceptionist: didn't find a language list in the config file!!");
     
    157161    }
    158162    Document style_doc = this.converter.getDOM(new File(xslt_file), "UTF-8");
     163    if (style_doc == null) {
     164        System.err.println("TransformingReceptionist: cant parse the xslt file needed, so returning the original page!");
     165        return page;
     166       
     167    }
    159168
    160169    // look for the format element in the page response
     
    166175        // need to transform the format info
    167176        String stylesheet_file = GSFile.stylesheetFile((String)this.config_params.get(GSConstants.GSDL3_HOME), (String)this.config_params.get(GSConstants.SITE_NAME), collection, (String)this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces,   "config_format.xsl");
    168         Document stylesheet = this.converter.getDOM(new File(stylesheet_file));
    169         Document format_doc = this.converter.newDOM();
    170         format_doc.appendChild(format_doc.importNode(format_elem, true));
    171         Element new_format = (Element)this.transformer.transform(stylesheet, format_doc);
     177        Document stylesheet_doc = this.converter.getDOM(new File(stylesheet_file));
     178        if (stylesheet_doc != null) {
     179        Document format_doc = this.converter.newDOM();
     180        format_doc.appendChild(format_doc.importNode(format_elem, true));
     181        Element new_format = (Element)this.transformer.transform(stylesheet_doc, format_doc);
    172182        ///ystem.err.println("new format elem="+this.converter.getPrettyString(new_format));
    173183       
    174184        // add it in to the main stylesheet
    175         GSXSLT.mergeStylesheets(style_doc, new_format);
     185        GSXSLT.mergeStylesheets(style_doc, new_format);
     186        } else {
     187        System.err.println("TransformingReceptionist: couldn't parse the config_format stylesheet, adding the format info as is");
     188        GSXSLT.mergeStylesheets(style_doc, format_elem);
     189        }
    176190        ///ystem.out.println("the converted stylesheet is:");
    177191        ///ystem.out.println(this.converter.getPrettyString(style_doc.getDocumentElement()));
Note: See TracChangeset for help on using the changeset viewer.