Changeset 19585

Show
Ignore:
Timestamp:
25.05.2009 13:42:15 (10 years ago)
Author:
ak19
Message:

Changes made when re-testing the independently launchend GSI (and the GSI launched through GLI) on Windows.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

    r19547 r19585  
    200200    } else if(llssite_cfg_file.isIndependentGSI()) { 
    201201        // there is a url, it's not pending, and it is llssite.cfg: meaning GSI has started up 
     202        running = true; 
    202203        return;      
    203204    } 
     
    397398        } 
    398399        catch (MalformedURLException exception) { 
     400            running = false; 
    399401            exception.printStackTrace(); 
    400             DebugStream.printStackTrace(exception); 
     402            DebugStream.printStackTrace(exception);          
    401403        } 
    402404        return false; 
     
    415417    String url = llssite_cfg_file.getURL(); 
    416418    if(url != null) { 
    417         if(isURLPending()) { 
     419        if(url.equals(LLSSiteConfig.URL_PENDING)) { 
    418420        running = false; 
    419421        return; 
     
    423425        try { 
    424426        Configuration.library_url = new URL(url); 
     427        running = true; 
    425428        } 
    426429        catch (MalformedURLException exception) { 
     430        running = false; 
    427431        DebugStream.printStackTrace(exception); 
    428432        exception.printStackTrace(); 
    429433        } 
    430     }  
     434    } 
    431435    else { // NO URL in current ConfigFile, check the other configfile for a URL  
    432436        // to see if the server was restarted using that file. 
     
    435439 
    436440        if(llssite_cfg_file.usingLLS_configFile()) { // if a GSI is already using llssite_cfg, this would have loaded it in 
    437         if(isURLPending()) { 
     441        url = llssite_cfg_file.getURL(); //if(isURLPending()) { 
     442        if(url.equals(LLSSiteConfig.URL_PENDING)) { 
    438443            running = false; 
    439444        } else { 
     
    525530 
    526531    /** Tries to get a glisite.cfg file and then loads it, setting it as the configFile */ 
    527     public void useGLISiteCfg(File server_exe) { 
     532    public void useGLISiteCfg(File server_exe) 
     533    { 
    528534        if(!glisite_cfg.exists()) { // create it from the templates or the llssite.cfg file 
    529535         
     
    577583 
    578584        lastModified = configFile.lastModified(); 
    579         //System.err.println("***** we're using llssite_configfile, url:" + getURL()); 
    580585        return true; 
    581586    }