delete fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@162455 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
49cc94dd93
commit
c7b93c71f7
|
@ -3,15 +3,6 @@
|
|||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||
<dependent-module archiveName="grsf-common-library-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-common-library/grsf-common-library">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module archiveName="home-library-jcr-2.11.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/HomeLibraryJCR/HomeLibraryJCR">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module archiveName="home-library-model-1.8.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/home-library-model/home-library-model">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<property name="context-root" value="grsf-publisher-ws"/>
|
||||
<property name="java-output-path" value="/grsf-publisher-ws/target/classes"/>
|
||||
</wb-module>
|
||||
|
|
|
@ -272,7 +272,7 @@ public class GrsfPublisherFisheryService {
|
|||
// check it is in the right source and it is a fishery
|
||||
String type = fisheryInCkan.getExtrasAsHashMap().get(Constants.DOMAIN_CUSTOM_KEY);
|
||||
|
||||
if(fisheryInCkan.getOrganization().getName().equalsIgnoreCase(source) &&
|
||||
if((fisheryInCkan.getOrganization().getName().equalsIgnoreCase(source) || fisheryInCkan.getOrganization().getName().toLowerCase().contains(source))&&
|
||||
Product_Type.FISHERY.getOrigName().equals(type)){
|
||||
|
||||
logger.debug("Ok, this is a fishery of the right source, removing it");
|
||||
|
|
|
@ -272,8 +272,8 @@ public class GrsfPublisherStockService {
|
|||
|
||||
// check it is in the right source and it is a stock
|
||||
String type = stockInCkan.getExtrasAsHashMap().get(Constants.DOMAIN_CUSTOM_KEY);
|
||||
if(stockInCkan.getOrganization().getName().equalsIgnoreCase(source) &&
|
||||
Product_Type.STOCK.getOrigName().equals(type)){
|
||||
if((stockInCkan.getOrganization().getName().equalsIgnoreCase(source) || stockInCkan.getOrganization().getName().toLowerCase().contains(source))
|
||||
&& Product_Type.STOCK.getOrigName().equals(type)){
|
||||
|
||||
logger.debug("Ok, this is a stock of the right type, removing it");
|
||||
boolean deleted = catalogue.deleteProduct(stockInCkan.getId(), apiKey, true);
|
||||
|
|
Loading…
Reference in New Issue