Changeset 31771

Show
Ignore:
Timestamp:
30.06.2017 14:43:12 (4 weeks ago)
Author:
kjdon
Message:

we need to pass library_name to the incremental-buildcol so that it can deactivate the collection before modifying the database

Location:
main/trunk/greenstone3/src/java/org/greenstone/gsdl3
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/CollectionConstructor.java

    r31671 r31771  
    1616    /** the name of the site */ 
    1717    protected String site_name = null; 
     18  /** the library (servlet) name of the site */ 
     19  protected String library_name = null; 
    1820    /** the name of the collection */ 
    1921    protected String collection_name = null; 
     
    7375    } 
    7476 
     77  public void setLibraryName(String library_name) { 
     78    this.library_name = library_name; 
     79  } 
    7580    public void setCollectionName(String coll_name) 
    7681    { 
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

    r31758 r31771  
    214214        command.add("-collectdir"); 
    215215        command.add(GSFile.collectDir(this.site_home)); 
     216        command.add("-library_name"); 
     217        command.add(this.library_name); 
    216218//      command.add("-removeold"); // saves some seconds processing time when this flag's added in explicitly 
    217219        command.addAll(extractParameters(this.process_params)); 
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

    r31592 r31771  
    786786 
    787787        constructor.setSiteHome(this.site_home); 
     788        constructor.setLibraryName(this.library_name); 
    788789        constructor.setCollectionName(coll_name); 
    789790        constructor.setActionType(type);