Project

General

Profile

« Previous | Next » 

Revision 40548

Added by Nikon Gasparis almost 9 years ago

added dummy method to return countries without using cache.
enabled by parameter: services.repo-manager.repository.testing.mode

View differences:

modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/server/RepositoryServiceImpl.java
10 10 
import org.apache.commons.lang.WordUtils;
11 11 
import org.apache.log4j.Logger;
12 12 
import org.springframework.beans.factory.annotation.Autowired;
13 
import org.springframework.beans.factory.annotation.Value;
13 14 
import org.springframework.stereotype.Service;
14 15 

  		




  15
  16
  
    
import java.util.*;


  		




  ......




  33
  34
  
    
    @Autowired


  		




  34
  35
  
    
    private VocabularyLoader vocabularyLoader;


  		




  35
  36
  
    

  		




  
  37
  
    
    @Value("${services.repo-manager.repository.testing.mode}")


  		




  
  38
  
    
    private boolean testingMode;


  		




  
  39
  
    

  		




  36
  40
  
    
    @Override


  		




  37
  41
  
    
    public Tuple<List<Repository>, List<Repository>> getRepositoriesByCountry(String country, String mode, boolean includeUnknownCountries) throws RepositoryServiceException {


  		




  38
  42
  
    
        try {


  		




  
  43
  
    
            if (testingMode)


  		




  
  44
  
    
                return this.getRepositoriesByCountryTesting(country, mode, includeUnknownCountries);


  		




  39
  45
  
    
            LOGGER.debug("Getting repositories of country: " + country + " with type: " + mode + " and includeUnknownCountries: " + includeUnknownCountries);


  		




  40
  46
  
    

  		




  41
  47
  
    
            Tuple<List<Repository>, List<Repository>> retTuple = new Tuple<List<Repository>, List<Repository>>();


  		




  ......




  157
  163
  
    
        }*/


  		




  158
  164
  
    
    }


  		




  159
  165
  
    

  		




  
  166
  
    

  		




  
  167
  
    
    private Tuple<List<Repository>, List<Repository>> getRepositoriesByCountryTesting(String country, String mode, boolean includeUnknownCountries) throws RepositoryServiceException {


  		




  
  168
  
    
        try {


  		




  
  169
  
    
            LOGGER.debug("Getting testing repositories of country: " + country + " with type: " + mode + " and includeUnknownCountries: " + includeUnknownCountries);


  		




  
  170
  
    

  		




  
  171
  
    
            Tuple<List<Repository>, List<Repository>> retTuple = new Tuple<List<Repository>, List<Repository>>();


  		




  
  172
  
    
            List<Repository> reposList = new ArrayList<Repository>();


  		




  
  173
  
    
            reposList.add(this.repoAPI.getRepository("opendoar____::1356"));


  		




  
  174
  
    
            reposList.add(this.repoAPI.getRepository("opendoar____::2678"));


  		




  
  175
  
    
            reposList.add(this.repoAPI.getRepository("opendoar____::2980"));


  		




  
  176
  
    
            reposList.add(this.repoAPI.getRepository("opendoar____::1347"));


  		




  
  177
  
    

  		




  
  178
  
    
            retTuple.setFirst(reposList);


  		




  
  179
  
    

  		




  
  180
  
    
            if(includeUnknownCountries) {


  		




  
  181
  
    
                List<Repository> totalList = new ArrayList<Repository>();


  		




  
  182
  
    
                totalList.add(this.repoAPI.getRepository("opendoar____::3000"));


  		




  
  183
  
    
                totalList.add(this.repoAPI.getRepository("opendoar____::1027"));


  		




  
  184
  
    
                totalList.add(this.repoAPI.getRepository("opendoar____::1096"));


  		




  
  185
  
    

  		




  
  186
  
    
                retTuple.setSecond(totalList);


  		




  
  187
  
    
            }


  		




  
  188
  
    

  		




  
  189
  
    
            return retTuple;


  		




  
  190
  
    

  		




  
  191
  
    
        } catch (Exception e) {


  		




  
  192
  
    
            LOGGER.error("Error while getting testing repositories of country: " + country + " with type: " + mode+ " and includeUnknownCountries: " + includeUnknownCountries, e);


  		




  
  193
  
    
            if (e instanceof RepositoryServiceException) {


  		




  
  194
  
    
                throw (RepositoryServiceException) e;


  		




  
  195
  
    
            } else {


  		




  
  196
  
    
                emailUtils.reportException(e);


  		




  
  197
  
    
                throw new RepositoryServiceException("login.generalError", RepositoryServiceException.ErrorCode.GENERAL_ERROR);


  		




  
  198
  
    
            }


  		




  
  199
  
    
        }


  		




  
  200
  
    
    }


  		




  
  201
  
    

  		




  160
  202
  
    
    /*    @Override


  		




  161
  203
  
    
    public List<Repository> getRepositoriesByCountry(String country, String mode) throws RepositoryServiceException {


  		




  162
  204
  
    
        try {


  		












  

    
      modules/uoa-repository-manager-gui/trunk/src/main/resources/eu/dnetlib/repo/manager/server/springContext-repo-manager.properties
    
  





  10
  10
  
    
# he will receive all the automatic bug reports and feedback created


  		




  11
  11
  
    
services.repo-manager.adminEmail = nikonas@di.uoa.gr


  		




  12
  12
  
    

  		




  
  13
  
    
# if set to true, getRepositories will return dummy repositories


  		




  
  14
  
    
services.repo-manager.repository.testing.mode = false;


  		




  13
  15
  
    

  		




  14
  16
  
    
# the mailhost for the mail service


  		




  15
  17
  
    
services.validator.mail.host = smtp.gmail.com


  		












Also available in:  Unified diff