Changeset 19203


Ignore:
Timestamp:
2009-04-22T17:39:05+12:00 (12 years ago)
Author:
ak19
Message:

Undoing the changes where the Collection.getName() always returned the groupQualifiedName(). Now it returns the collection's subname again.

Location:
gli/trunk/src/org/greenstone/gatherer
Files:
4 edited

Legend:

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

    r19197 r19203  
    181181     */
    182182    public String getName() {
    183     return getGroupQualifiedName(true);
     183    return getCollectionSubName();
     184    //return getGroupQualifiedName(true);
    184185    }
    185186
  • gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

    r19197 r19203  
    906906
    907907    /** Returns the name of the loaded collection.
    908      *  Returns the "collectionGroupName/collectionName" or just the collectionName
    909      *  depending on whether the collection is part of a collection group or not.
    910908     */
    911909    static public String getLoadedCollectionName()
  • gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

    r19194 r19203  
    175175        File localLinuxServerFolder = new File(gsdl_path, "apache-httpd");
    176176        if (!localLinuxServerFolder.exists() && !localLinuxServerFolder.isDirectory()) {
    177         System.err.println("The web server does not exist at "
    178                    + localLinuxServerFolder.getAbsolutePath() + "\nNo local library at all. Trying web library");
    179177        DebugStream.println("The web server does not exist at "
    180178                    + localLinuxServerFolder.getAbsolutePath() + "\nNo local library at all. Trying web library");
  • gli/trunk/src/org/greenstone/gatherer/gui/PreviewButton.java

    r19197 r19203  
    7777    // so getting a collection-name may have a collection group prefix
    7878    // This means CollectionManager.getLoadedCollectionName() is no longer sufficient
    79     String collGroupWithName = CollectionManager.getLoadedCollectionName();
     79    String collGroupWithName = CollectionManager.getLoadedGroupQualifiedCollectionName(true);
    8080
    8181    // set up the home page for the current collection
Note: See TracChangeset for help on using the changeset viewer.