Changeset 3441 for trunk/gsdl3


Ignore:
Timestamp:
2002-10-04T11:37:17+12:00 (22 years ago)
Author:
kjdon
Message:

uses new GSFile methods

Location:
trunk/gsdl3/src/java/org/greenstone/gsdl3
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/action/AppletAction.java

    r3385 r3441  
    1717
    1818    // find the stylesheet
    19     String stylesheet = GSFile.stylesheetPath(config_, "applet.xsl");
     19    String stylesheet = GSFile.stylesheetFile(config_, "applet.xsl");
    2020
    2121    if (stylesheet==null) {
    … …  
    8080        // add in the applet info
    8181       
     82        //page.appendChild(doc_.importNode(GSXML.getNodeByPath(mr_response, "response/service/applet"), true));
    8283        page.appendChild(doc_.importNode(GSXML.getNodeByPath(mr_response, "response/service/applet"), true));
    83        
    8484        return transformer_.transform(stylesheet, page);
    8585    }

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/action/PageAction.java

    r3388 r3441  
    8282    page.appendChild(doc_.importNode(GSXML.getChildByTagName(coll_list_response, "response"), true));
    8383
    84     String stylesheet = GSFile.stylesheetPath(config_, "home.xsl");
     84    String stylesheet = GSFile.stylesheetFile(config_, "home.xsl");
    8585    String transformed_result = transformer_.transform(stylesheet,
    8686                               page);   
    … …  
    110110
    111111    // process using the stylesheet
    112     String stylesheet = GSFile.stylesheetPath(config_, "about.xsl");
     112    String stylesheet = GSFile.stylesheetFile(config_, "about.xsl");
    113113
    114114    //System.out.println("response="+converter_.getString(page));

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java

    r3388 r3441  
    5353
    5454    // chack that the stylesheet is present - cant output a page without one. we may adapt this to use unknownquery stylesheet? - or ask for one from the MR
    55     String stylesheet = GSFile.stylesheetPath(config_, "textquery.xsl");
     55    String stylesheet = GSFile.stylesheetFile(config_, "textquery.xsl");
    5656    if (stylesheet==null) {
    5757        return GSHTML.errorPage("textquery stylesheet not found!");

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/action/ResourceAction.java

    r3363 r3441  
    1717
    1818    // find the stylesheet
    19     String stylesheet = GSFile.stylesheetPath(config_, "resource.xsl");
     19    String stylesheet = GSFile.stylesheetFile(config_, "resource.xsl");
    2020
    2121    if (stylesheet==null) {

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/Collection.java

    r3235 r3441  
    109109    }
    110110    // read the collection build configuration file
    111     File config_file_ = GSFile.collectionBuildConfigFile(site_home_, collection_name_);
     111    File config_file_ = new File(GSFile.collectionBuildConfigFile(site_home_, collection_name_));
    112112
    113113    if (!config_file_.exists()) {

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

    r3286 r3441  
    125125
    126126    // read thru own config file - create services and connect to sites
    127     File configFile = GSFile.siteConfigFile(site_home_);
     127    File configFile = new File(GSFile.siteConfigFile(site_home_));
    128128
    129129    if (configFile.exists() ) {
    … …  
    137137
    138138    // read thru the collect directory and create all the collections
    139     File collectDir = GSFile.collectDirFile(site_home_);
     139    File collectDir = new File(GSFile.collectDir(site_home_));
    140140    if (collectDir.exists()) {
    141141        System.out.println("Reading thru directory "+collectDir.getPath()+" to find collections.");

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceModule.java

    r3363 r3441  
    117117    if (collection_name_ !=null) {
    118118       
    119         config_file = GSFile.collectionBuildConfigFile(site_home_, collection_name_);
     119        config_file = new File(GSFile.collectionBuildConfigFile(site_home_, collection_name_));
    120120    }
    121121    else {
    122         config_file = GSFile.siteConfigFile(site_home_);
     122        config_file = new File(GSFile.siteConfigFile(site_home_));
    123123    }
    124124

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/util/Translate.java

    r3388 r3441  
    4141    }
    4242
    43     File lang_file = GSFile.getLangFile(config_, lang);
     43    File lang_file = new File (GSFile.translateFile(config_, lang));
    4444    if (!lang_file.exists()) {
    4545        System.out.println("file "+lang_file.getPath()+" doesn't exist");
Note: See TracChangeset for help on using the changeset viewer.