Author: reto
Date: Fri Apr 13 14:03:20 2012
New Revision: 1325778
URL: http://svn.apache.org/viewvc?rev=1325778&view=rev
Log:
using new ConstrainedDocumentSet api
Added:
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/ConstraintResource.java
- copied, changed from r1309851,
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/CountResource.java
Removed:
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/CountResource.java
Modified:
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource.java
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/RootResource.java
Copied:
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/ConstraintResource.java
(from r1309851,
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/CountResource.java)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/ConstraintResource.java?p2=incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/ConstraintResource.java&p1=incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/CountResource.java&r1=1309851&r2=1325778&rev=1325778&view=diff
==============================================================================
---
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/CountResource.java
(original)
+++
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/ConstraintResource.java
Fri Apr 13 14:03:20 2012
@@ -8,6 +8,8 @@ import java.util.List;
import java.util.Map;
import org.apache.solr.client.solrj.response.FacetField.Count;
+import
org.apache.stanbol.contenthub.servicesapi.search.featured.ConstrainedDocumentSet;
+import org.apache.stanbol.contenthub.servicesapi.search.featured.Constraint;
import org.apache.stanbol.webdav.resources.AbstractCollectionResource;
import com.bradmcevoy.http.Auth;
@@ -21,24 +23,26 @@ import com.bradmcevoy.http.Resource;
import com.bradmcevoy.http.exceptions.BadRequestException;
import com.bradmcevoy.http.exceptions.NotAuthorizedException;
-public class CountResource extends AbstractCollectionResource implements
PropFindableResource, GetableResource, CollectionResource {
+public class ConstraintResource extends AbstractCollectionResource implements
PropFindableResource, GetableResource, CollectionResource {
private static final String MESSAGE = "Hello world";
- private Count value;
-
- public CountResource(Count value) {
- this.value = value;
+ private ConstrainedDocumentSet cds;
+ private Constraint constraint;
+
+ public ConstraintResource(ConstrainedDocumentSet cds, Constraint
constraint) {
+ this.cds = cds;
+ this.constraint = constraint;
}
public String getUniqueId() {
- return value.getName();
+ return constraint.getValue();
}
public String getName() {
- return value.getName();
+ return constraint.getValue();
}
public Object authenticate(String user, String password) {
@@ -94,6 +98,7 @@ public class CountResource extends Abstr
//TODO here we should add:
//- The categories as in root for the categories that have an
entry that can reduce the current set of matching documents (but not to the
empty set)
//- Add the matching items
+
return resources;
}
Modified:
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource.java?rev=1325778&r1=1325777&r2=1325778&view=diff
==============================================================================
---
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource.java
(original)
+++
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/FacetedResource.java
Fri Apr 13 14:03:20 2012
@@ -24,8 +24,12 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.solr.client.solrj.response.FacetField.Count;
+import
org.apache.stanbol.contenthub.servicesapi.search.featured.ConstrainedDocumentSet;
+import org.apache.stanbol.contenthub.servicesapi.search.featured.Constraint;
+import org.apache.stanbol.contenthub.servicesapi.search.featured.Facet;
import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
import org.apache.stanbol.webdav.resources.AbstractCollectionResource;
@@ -43,21 +47,24 @@ import com.bradmcevoy.http.exceptions.No
public class FacetedResource extends AbstractCollectionResource implements
PropFindableResource, GetableResource, CollectionResource {
private static final String MESSAGE = "Hello world";
- private FacetResult fr;
+ private Facet facet;
+ private ConstrainedDocumentSet cds;
- public FacetedResource(FacetResult fr) {
- this.fr = fr;
+
+ public FacetedResource(ConstrainedDocumentSet cds, Facet facet) {
+ this.cds = cds;
+ this.facet = facet;
}
public String getUniqueId() {
- return fr.getFacetField().getName();
+ return facet.getLabel(null);
}
public String getName() {
- return fr.getFacetField().getName();
+ return facet.getLabel(null);
}
public Object authenticate(String user, String password) {
@@ -110,9 +117,9 @@ public class FacetedResource extends Abs
throws NotAuthorizedException, BadRequestException {
// TODO Auto-generated method stub
List<Resource> resources = new ArrayList<Resource>();
- List<Count> values = fr.getFacetField().getValues();
- for (Count value : values) {
- resources.add(new CountResource(value));
+ Set<Constraint> constraints = facet.getConstraints();
+ for (Constraint constraint : constraints) {
+ resources.add(new ConstraintResource(cds, constraint));
}
/* resources.add(new FacetedResource("bar1"));
resources.add(new FacetedResource("bar2"));
Modified:
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/RootResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/RootResource.java?rev=1325778&r1=1325777&r2=1325778&view=diff
==============================================================================
---
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/RootResource.java
(original)
+++
incubator/stanbol/branches/ontonet-showcase/featured-vfolders/src/main/java/org/apache/stanbol/contenthub/vfolders/RootResource.java
Fri Apr 13 14:03:20 2012
@@ -3,15 +3,20 @@ package org.apache.stanbol.contenthub.vf
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
+import
org.apache.stanbol.contenthub.servicesapi.search.featured.ConstrainedDocumentSet;
+import org.apache.stanbol.contenthub.servicesapi.search.featured.Facet;
import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
import
org.apache.stanbol.contenthub.servicesapi.search.featured.FeaturedSearch;
import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
+import org.apache.stanbol.contenthub.servicesapi.search.featured.Constraint;
import org.apache.stanbol.webdav.resources.AbstractCollectionResource;
import com.bradmcevoy.http.Auth;
@@ -74,13 +79,13 @@ public class RootResource extends Abstra
public List<Resource> getChildren() {
try {
- SearchResult searchResult = featuredSearch.search("a*");
- List<FacetResult> facetResults =
searchResult.getFacets();
+ ConstrainedDocumentSet cds =
featuredSearch.search("*:*", new HashSet<Constraint>());
+ Set<Facet> facetResults = cds.getFacets();
List<Resource> resources = new ArrayList<Resource>();
- for (FacetResult fr : facetResults) {
- final String name =
fr.getFacetField().getName();
+ for (Facet fr : facetResults) {
+ final String name = fr.getLabel(null);
System.out.println("name: "+name);
- resources.add(new FacetedResource(fr));
+ resources.add(new FacetedResource(cds, fr));
}
//resources.add(new SlingResource());
System.out.println("returning: "+resources);
