Changeset 19598 for gli


Ignore:
Timestamp:
2009-05-26T15:55:58+12:00 (15 years ago)
Author:
ak19
Message:

Corrected previous commit to avoid the changed code in the remote GS case.

File:
1 edited

Legend:

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

    r19547 r19598  
    8888    }
    8989
    90     // check that the local library server is still running  - doesn't do anything if it's not supposed to be running
    91     // !! Don't like this here
    92     LocalLibraryServer.checkServerRunning();
    93     if(LocalLibraryServer.isURLPending()) {
    94         // Remind the user to press Enter Library, and return from this method
    95         JOptionPane.showMessageDialog(Gatherer.g_man,
    96                       Dictionary.get("General.LLS_Not_Started"),
    97                       Dictionary.get("General.LLS_Not_Started_Title"),
    98                       JOptionPane.ERROR_MESSAGE);
    99         preview_address = null;
    100         return;   
    101     }
    102    
     90    if(!Gatherer.isGsdlRemote) {
     91        // check that the local library server is still running  - doesn't do anything if it's not supposed to be running
     92        // !! Don't like this here
     93        LocalLibraryServer.checkServerRunning();
     94        if(LocalLibraryServer.isURLPending()) {
     95        // Remind the user to press Enter Library, and return from this method
     96        JOptionPane.showMessageDialog(Gatherer.g_man,
     97                          Dictionary.get("General.LLS_Not_Started"),
     98                          Dictionary.get("General.LLS_Not_Started_Title"),
     99                          JOptionPane.ERROR_MESSAGE);
     100        preview_address = null;
     101        return;   
     102        }
     103    }
    103104    // FLI or GLI for GS2 case (no library_url)
    104105    preview_address = Configuration.library_url.toString() + "?c=" + collGroupWithName + "&l=" + Configuration.getLanguage();
Note: See TracChangeset for help on using the changeset viewer.