diff --git a/.github/coverage/jacoco.csv b/.github/coverage/jacoco.csv index 7bce84d36..758f79398 100644 --- a/.github/coverage/jacoco.csv +++ b/.github/coverage/jacoco.csv @@ -48,8 +48,8 @@ Portal-Core,org.auscope.portal.core.services.responses.wcs,SingleValue,0,17,0,0, Portal-Core,org.auscope.portal.core.services.responses.wcs,CoverageOfferingBrief,45,120,2,4,18,27,8,8,6,7 Portal-Core,org.auscope.portal.core.services.responses.wcs,SimpleEnvelope,77,137,4,6,16,28,6,10,2,9 Portal-Core,org.auscope.portal.core.services.responses.wcs,TimeConstraint,41,65,5,5,5,14,4,8,1,6 -Portal-Core,org.auscope.portal.core.services.responses.wcs,SimpleTimePosition,0,45,0,0,0,13,0,3,0,3 Portal-Core,org.auscope.portal.core.services.responses.wcs,RectifiedGrid,89,244,0,8,17,63,1,21,1,17 +Portal-Core,org.auscope.portal.core.services.responses.wcs,SimpleTimePosition,0,45,0,0,0,13,0,3,0,3 Portal-Core,org.auscope.portal.core.services.responses.wcs,AxisDescriptionImpl,4,79,1,3,1,16,1,6,0,5 Portal-Core,org.auscope.portal.core.services.csw.custom,CustomRegistry,78,0,8,0,23,0,15,0,11,0 Portal-Core,org.auscope.portal.core.server.http,HttpServiceCaller,241,163,15,15,57,41,22,10,12,5 @@ -166,7 +166,7 @@ Portal-Core,org.auscope.portal.core.cloud,StagingInformation,4,9,0,0,2,4,1,2,1,2 Portal-Core,org.auscope.portal.core.cloud,CloudDirectoryInformation,99,0,6,0,34,0,16,0,13,0 Portal-Core,org.auscope.portal.core.uifilter,Predicate,0,33,0,0,0,2,0,1,0,1 Portal-Core,org.auscope.portal.core.uifilter,AbstractBaseFilter,29,0,0,0,11,0,8,0,8,0 -Portal-Core,org.auscope.portal.core.uifilter,GenericFilter,156,107,15,13,36,24,16,8,5,5 +Portal-Core,org.auscope.portal.core.uifilter,GenericFilter,186,107,19,13,42,24,18,8,5,5 Portal-Core,org.auscope.portal.core.uifilter,GenericFilterAdapter,41,0,2,0,10,0,3,0,2,0 Portal-Core,org.auscope.portal.core.uifilter,FilterCollection,24,0,0,0,10,0,7,0,7,0 Portal-Core,org.auscope.portal.core.services.responses.csw,CSWGetDomainResponse.CSWGetCapabilitiesNamespace,0,12,0,0,0,3,0,1,0,1 @@ -237,8 +237,8 @@ Portal-Core,org.auscope.portal.core.util,FileIOUtil,415,569,50,58,118,142,47,31, Portal-Core,org.auscope.portal.core.util,MimeUtil,20,143,5,15,6,33,6,7,1,2 Portal-Core,org.auscope.portal.core.util,DOMResponseUtil,19,41,0,0,5,11,1,1,1,1 Portal-Core,org.auscope.portal.core.util,ResourceUtil,15,14,1,1,2,5,2,2,1,2 -Portal-Core,org.auscope.portal.core.util,SLDLoader,137,84,11,9,29,22,10,5,3,2 Portal-Core,org.auscope.portal.core.util,DateUtil.TimeField,0,33,0,0,0,2,0,1,0,1 +Portal-Core,org.auscope.portal.core.util,SLDLoader,137,84,11,9,29,22,10,5,3,2 Portal-Core,org.auscope.portal.core.util,DOMUtil,3,136,0,2,1,37,1,9,1,8 Portal-Core,org.auscope.portal.core.util,HttpUtil,92,48,4,2,19,7,5,2,3,1 Portal-Core,org.auscope.portal.core.util,TextUtil,58,50,11,3,10,11,10,3,4,2 diff --git a/.github/coverage/percentage.txt b/.github/coverage/percentage.txt index 0094383c7..8b1378917 100644 --- a/.github/coverage/percentage.txt +++ b/.github/coverage/percentage.txt @@ -1 +1 @@ -64.0027 + diff --git a/src/main/java/org/auscope/portal/core/uifilter/GenericFilter.java b/src/main/java/org/auscope/portal/core/uifilter/GenericFilter.java index fa85799de..aa00d102a 100644 --- a/src/main/java/org/auscope/portal/core/uifilter/GenericFilter.java +++ b/src/main/java/org/auscope/portal/core/uifilter/GenericFilter.java @@ -68,6 +68,12 @@ private String parseTextType(JSONObject obj){ }else if(Predicate.valueOf(obj.getString("predicate")) == (Predicate.ISEQUAL)){ return this.generatePropertyIsEqualToFragment( obj.getString("xpath"), obj.getString("value")); + }else if(Predicate.valueOf(obj.getString("predicate")) == (Predicate.BIGGER_THAN)){ + return this.generatePropertyIsGreaterThan( + obj.getString("xpath"), obj.getString("value") ); + }else if(Predicate.valueOf(obj.getString("predicate")) == (Predicate.SMALLER_THAN)){ + return this.generatePropertyIsLessThan( + obj.getString("xpath"), obj.getString("value") ); }else throw new UnsupportedOperationException("Unable to parse text string fragment."); }