Project

General

Profile

« Previous | Next » 

Revision 41971

Added by Nikon Gasparis over 8 years ago

created new methods to get jobs with status

View differences:

modules/uoa-clients/trunk/src/main/java/eu/dnetlib/clients/functionality/validator/ws/ValidatorWebServiceClient.java
25 25 
	}
26 26 

  		




  27
  27
  
    
	@Override


  		




  28
  
  
    
	public List<StoredJob> getStoredJobs(String userMail, String jobType, Integer offset, Integer limit, String dateFrom, String dateTo, String jobStatus)


  		




  
  28
  
    
	public List<StoredJob> getStoredJobsNew(String userMail, String jobType, Integer offset, Integer limit, String dateFrom, String dateTo, String jobStatus)


  		




  29
  29
  
    
			throws ValidatorServiceException {


  		




  30
  
  
    
		return this.webService.getStoredJobs(userMail, jobType, offset, limit, dateFrom, dateTo, jobStatus);


  		




  
  30
  
    
		return this.webService.getStoredJobsNew(userMail, jobType, offset, limit, dateFrom, dateTo, jobStatus);


  		




  31
  31
  
    
	}


  		




  32
  32
  
    

  		




  33
  33
  
    
	@Override


  		




  ......




  37
  37
  
    
	}


  		




  38
  38
  
    

  		




  39
  39
  
    
	@Override


  		




  40
  
  
    
	public int getStoredJobsTotalNumber(String userMail, String jobType, String jobStatus)


  		




  
  40
  
    
	public int getStoredJobsTotalNumberNew(String userMail, String jobType, String jobStatus)


  		




  41
  41
  
    
			throws ValidatorServiceException {


  		




  42
  
  
    
		return this.webService.getStoredJobsTotalNumber(userMail, jobType, jobStatus);


  		




  
  42
  
    
		return this.webService.getStoredJobsTotalNumberNew(userMail, jobType, jobStatus);


  		




  43
  43
  
    
	}


  		




  44
  44
  
    

  		




  45
  45
  
    
	@Override


  		












  

    
      modules/uoa-clients/trunk/src/main/java/eu/dnetlib/clients/functionality/validator/ws/ValidatorWebService.java
    
  





  25
  25
  
    
	@WebMethod(operationName = "getStoredJobsTotalNumber")


  		




  26
  26
  
    
	int getStoredJobsTotalNumber(@WebParam(name = "userMail") String userMail, @WebParam(name = "jobType") String jobType) throws ValidatorServiceException;


  		




  27
  27
  
    

  		




  28
  
  
    
	@WebMethod(operationName = "getStoredJobsWithStatus")


  		




  29
  
  
    
	List<StoredJob> getStoredJobs(@WebParam(name = "userMail") String userMail, @WebParam(name = "jobType") String jobType, @WebParam(name = "offset") Integer offset, @WebParam(name = "limit") Integer limit, @WebParam(name = "dateFrom") String dateFrom, @WebParam(name = "dateTo") String dateTo, @WebParam(name = "jobStatus") String jobStatus) throws ValidatorServiceException;


  		




  
  28
  
    
	@WebMethod(operationName = "getStoredJobsNew")


  		




  
  29
  
    
	List<StoredJob> getStoredJobsNew(@WebParam(name = "userMail") String userMail, @WebParam(name = "jobType") String jobType, @WebParam(name = "offset") Integer offset, @WebParam(name = "limit") Integer limit, @WebParam(name = "dateFrom") String dateFrom, @WebParam(name = "dateTo") String dateTo, @WebParam(name = "jobStatus") String jobStatus) throws ValidatorServiceException;


  		




  30
  30
  
    

  		




  31
  
  
    
	@WebMethod(operationName = "getStoredJobsTotalNumberWithStatus")


  		




  32
  
  
    
	int getStoredJobsTotalNumber(@WebParam(name = "userMail") String userMail, @WebParam(name = "jobType") String jobType, @WebParam(name = "jobStatus") String jobStatus) throws ValidatorServiceException;


  		




  
  31
  
    
	@WebMethod(operationName = "getStoredJobsTotalNumberNew")


  		




  
  32
  
    
	int getStoredJobsTotalNumberNew(@WebParam(name = "userMail") String userMail, @WebParam(name = "jobType") String jobType, @WebParam(name = "jobStatus") String jobStatus) throws ValidatorServiceException;


  		




  33
  33
  
    

  		




  34
  34
  
    
	@WebMethod(operationName = "getRuleSets")


  		




  35
  35
  
    
	List<RuleSet> getRuleSets() throws ValidatorServiceException;


  		












  

    
      modules/uoa-clients/trunk/src/main/java/eu/dnetlib/clients/functionality/validator/ws/ValidatorWebServiceImpl.java
    
  





  1
  1
  
    
package eu.dnetlib.clients.functionality.validator.ws;


  		




  2
  2
  
    

  		




  3
  
  
    
import java.util.List;


  		




  4
  
  
    

  		




  5
  
  
    
import javax.jws.WebMethod;


  		




  6
  
  
    
import javax.jws.WebService;


  		




  7
  
  
    

  		




  8
  3
  
    
import eu.dnetlib.api.functionality.ValidatorService;


  		




  9
  4
  
    
import eu.dnetlib.api.functionality.ValidatorServiceException;


  		




  10
  5
  
    
import eu.dnetlib.clients.ws.BaseDriverWebService;


  		




  ......




  12
  7
  
    
import eu.dnetlib.domain.functionality.validator.RuleSet;


  		




  13
  8
  
    
import eu.dnetlib.domain.functionality.validator.StoredJob;


  		




  14
  9
  
    

  		




  
  10
  
    
import javax.jws.WebService;


  		




  
  11
  
    
import java.util.List;


  		




  
  12
  
    

  		




  15
  13
  
    
@WebService(


  		




  16
  14
  
    
		targetNamespace ="http://services.dnetlib.eu/",


  		




  17
  15
  
    
		serviceName = "ValidatorWebService", 


  		




  ......




  27
  25
  
    
	}


  		




  28
  26
  
    

  		




  29
  27
  
    
	@Override


  		




  30
  
  
    
	@WebMethod(operationName = "getStoredJobs")


  		




  31
  28
  
    
	public List<StoredJob> getStoredJobs(String userMail, String jobType,


  		




  32
  29
  
    
			Integer offset, Integer limit, String dateFrom, String dateTo) throws ValidatorServiceException {


  		




  33
  30
  
    
		return service.getStoredJobs(userMail, jobType, offset, limit, dateFrom, dateTo);


  		




  34
  31
  
    
	}


  		




  35
  32
  
    

  		




  36
  33
  
    
	@Override


  		




  37
  
  
    
	@WebMethod(operationName = "getStoredJobsWithStatus")


  		




  38
  
  
    
	public List<StoredJob> getStoredJobs(String userMail, String jobType,


  		




  
  34
  
    
	public List<StoredJob> getStoredJobsNew(String userMail, String jobType,


  		




  39
  35
  
    
										 Integer offset, Integer limit, String dateFrom, String dateTo, String jobStatus) throws ValidatorServiceException {


  		




  40
  
  
    
		return service.getStoredJobs(userMail, jobType, offset, limit, dateFrom, dateTo, jobStatus);


  		




  
  36
  
    
		return service.getStoredJobsNew(userMail, jobType, offset, limit, dateFrom, dateTo, jobStatus);


  		




  41
  37
  
    
	}


  		




  42
  38
  
    
	


  		




  43
  39
  
    
	@Override


  		




  44
  
  
    
	@WebMethod(operationName = "getStoredJobsTotalNumber")


  		




  45
  40
  
    
	public int getStoredJobsTotalNumber(String userMail, String jobType) throws ValidatorServiceException {


  		




  46
  41
  
    
		return service.getStoredJobsTotalNumber(userMail, jobType);


  		




  47
  42
  
    
	}


  		




  48
  43
  
    

  		




  49
  44
  
    
	@Override


  		




  50
  
  
    
	@WebMethod(operationName = "getStoredJobsTotalNumberWithStatus")


  		




  51
  
  
    
	public int getStoredJobsTotalNumber(String userMail, String jobType, String jobStatus) throws ValidatorServiceException {


  		




  52
  
  
    
		return service.getStoredJobsTotalNumber(userMail, jobType, jobStatus);


  		




  
  45
  
    
	public int getStoredJobsTotalNumberNew(String userMail, String jobType, String jobStatus) throws ValidatorServiceException {


  		




  
  46
  
    
		return service.getStoredJobsTotalNumberNew(userMail, jobType, jobStatus);


  		




  53
  47
  
    
	}


  		




  54
  48
  
    

  		




  55
  49
  
    
	@Override


  		












  

    
      modules/uoa-api/trunk/src/main/java/eu/dnetlib/api/functionality/ValidatorService.java
    
  





  15
  15
  
    

  		




  16
  16
  
    
	int getStoredJobsTotalNumber(String userMail, String jobType) throws ValidatorServiceException;


  		




  17
  17
  
    

  		




  18
  
  
    
	List<StoredJob> getStoredJobs(String userMail, String jobType, Integer offset, Integer limit, String dateFrom, String dateTo, String jobStatus) throws ValidatorServiceException;


  		




  
  18
  
    
	List<StoredJob> getStoredJobsNew(String userMail, String jobType, Integer offset, Integer limit, String dateFrom, String dateTo, String jobStatus) throws ValidatorServiceException;


  		




  19
  19
  
    

  		




  20
  
  
    
	int getStoredJobsTotalNumber(String userMail, String jobType, String jobStatus) throws ValidatorServiceException;


  		




  
  20
  
    
	int getStoredJobsTotalNumberNew(String userMail, String jobType, String jobStatus) throws ValidatorServiceException;


  		




  21
  21
  
    

  		




  22
  22
  
    
	List<RuleSet> getRuleSets() throws ValidatorServiceException;


  		




  23
  23
  
    

  		












  

    
      modules/uoa-repository-manager-gui/trunk/src/main/java/eu/dnetlib/repo/manager/server/services/ValidationServiceImpl.java
    
  





  145
  145
  
    
//            if (this.userOverridesRepoRegistration(user))


  		




  146
  146
  
    
//                jobs = getValidationService().getStoredJobs(null, jobType, offset, limit, null, null);


  		




  147
  147
  
    
//            else


  		




  148
  
  
    
                jobs = getValidationService().getStoredJobs(user, jobType, offset, limit, dateFrom, dateTo, jobStatus);


  		




  
  148
  
    
                jobs = getValidationService().getStoredJobsNew(user, jobType, offset, limit, dateFrom, dateTo, jobStatus);


  		




  149
  149
  
    
            return jobs;


  		




  150
  150
  
    
        } catch (Exception e) {


  		




  151
  151
  
    
            LOGGER.error("Error getting jobs of user " + user, e);


  		




  ......




  163
  163
  
    
//            if (this.userOverridesRepoRegistration(user))


  		




  164
  164
  
    
//                sum = getValidationService().getStoredJobsTotalNumber(null, jobType);


  		




  165
  165
  
    
//            else


  		




  166
  
  
    
                sum = getValidationService().getStoredJobsTotalNumber(user, jobType, jobStatus);


  		




  
  166
  
    
                sum = getValidationService().getStoredJobsTotalNumberNew(user, jobType, jobStatus);


  		




  167
  167
  
    
            return sum;


  		




  168
  168
  
    
        } catch (Exception e) {


  		




  169
  169
  
    
            LOGGER.error("Error getting jobs of user " + user, e);


  		












  

    
      modules/uoa-validator-service/trunk/src/main/java/eu/dnetlib/validator/service/impl/ValidatorServiceImpl.java
    
  





  79
  79
  
    
	}


  		




  80
  80
  
    

  		




  81
  81
  
    
	@Override


  		




  82
  
  
    
	public List<StoredJob> getStoredJobs(String userMail, String jobType,


  		




  
  82
  
    
	public List<StoredJob> getStoredJobsNew(String userMail, String jobType,


  		




  83
  83
  
    
										 Integer offset, Integer limit, String dateFrom, String dateTo, String jobStatus)


  		




  84
  84
  
    
			throws ValidatorServiceException {


  		




  85
  85
  
    
		try {


  		




  ......




  102
  102
  
    
	}


  		




  103
  103
  
    

  		




  104
  104
  
    
	@Override


  		




  105
  
  
    
	public int getStoredJobsTotalNumber(String userMail, String jobType, String jobStatus)


  		




  
  105
  
    
	public int getStoredJobsTotalNumberNew(String userMail, String jobType, String jobStatus)


  		




  106
  106
  
    
			throws ValidatorServiceException {


  		




  107
  107
  
    
		try {


  		




  108
  108
  
    
			logger.debug("received request for total number of jobs of user " + userMail);


  		












Also available in:  Unified diff