From 49b8424965da4ab5dd6d4a129d8a0463a657fb44 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 21 Apr 2022 15:41:13 +0200 Subject: [PATCH] Added support for status ANY --- .../org/gcube/gcat/persistence/ckan/CKANPackage.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java index 48cbbe7..ded7072 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java @@ -1058,11 +1058,6 @@ public class CKANPackage extends CKAN implements Moderated { if(isModerationEnabled()) { String q = parameters.get(GCatConstants.Q_KEY); - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("("); - stringBuffer.append(CM_STATUS_QUERY_FILTER_KEY); - stringBuffer.append(":"); - CMItemStatus cmItemStatus = getRequestedCMItemStatus(); this.apiKey = CKANUtility.getSysAdminAPI(); @@ -1092,7 +1087,12 @@ public class CKANPackage extends CKAN implements Moderated { cmItemStatus = CMItemStatus.APPROVED; } + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("("); + stringBuffer.append(CM_STATUS_QUERY_FILTER_KEY); + stringBuffer.append(":"); stringBuffer.append(cmItemStatus.getValue()); + if(cmItemStatus == CMItemStatus.APPROVED) { stringBuffer.append(" OR (*:* -"); stringBuffer.append(CM_STATUS_QUERY_FILTER_KEY);