[Openutils-svn] SF.net SVN: openutils:[4208] magnoliamodules/branches/magnolia44/ openutils-mgnltagcloud

[<fg...@us...>]

Revision: 4208
          http://openutils.svn.sourceforge.net/openutils/?rev=4208&view=rev
Author:   fgiust
Date:     2013-04-02 21:03:01 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
TAGCLOUD-18 jackrabbit 2.4 compatibility

Modified Paths:
--------------
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
    magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/pom.xml	2013-04-02 21:03:01 UTC (rev 4208)
@@ -171,7 +171,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <magnolia.version>4.4.2</magnolia.version>
-    <jackrabbit.version>2.4.0</jackrabbit.version>
+    <magnolia.version>4.4.9-jr24</magnolia.version>
+    <jackrabbit.version>2.4.1</jackrabbit.version>
   </properties>
 </project>
\ No newline at end of file

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/HierarchyBoboIndexReader.java	2013-04-02 21:03:01 UTC (rev 4208)
@@ -51,8 +51,7 @@
         Collection<FacetHandler< ? >> facetHandlers,
         WorkArea workArea) throws IOException
     {
-        super(indexReader, facetHandlers, null, workArea);
-
+        super(indexReader, facetHandlers, null, workArea, false);
         resolver = (HierarchyResolver) indexReader;
     }
 

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManager.java	2013-04-02 21:03:01 UTC (rev 4208)
@@ -49,8 +49,9 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Query;
 
-import com.browseengine.bobo.api.BoboBrowser;
 import com.browseengine.bobo.api.BoboIndexReader;
+import com.browseengine.bobo.api.BoboSubBrowser;
+import com.browseengine.bobo.api.Browsable;
 import com.browseengine.bobo.api.BrowseException;
 import com.browseengine.bobo.api.BrowseFacet;
 import com.browseengine.bobo.api.BrowseRequest;
@@ -209,23 +210,31 @@
 
             br.setFacetSpec(propertyName, tagsSpec);
 
-            BoboBrowser browser = new BoboBrowser(boboReader);
+            Browsable browser = new BoboSubBrowser(boboReader);
+            try
+            {
 
-            // perform browse
-            BrowseResult result = browser.browse(br);
+                // perform browse
+                BrowseResult result = browser.browse(br);
 
-            // get tags
-            Map<String, FacetAccessible> facetMap = result.getFacetMap();
+                // get tags
+                Map<String, FacetAccessible> facetMap = result.getFacetMap();
 
-            FacetAccessible tagsFacets = facetMap.get(propertyName);
-            List<BrowseFacet> tagsVals = tagsFacets.getFacets();
+                FacetAccessible tagsFacets = facetMap.get(propertyName);
+                List<BrowseFacet> tagsVals = tagsFacets.getFacets();
 
-            // store them in tagCloud itself
-            tagCloud.setTags(new HashMap<String, Integer>());
-            for (BrowseFacet bf : tagsVals)
+                // store them in tagCloud itself
+                tagCloud.setTags(new HashMap<String, Integer>());
+                for (BrowseFacet bf : tagsVals)
+                {
+                    tagCloud.getTags().put(bf.getValue(), bf.getHitCount());
+                }
+            }
+            finally
             {
-                tagCloud.getTags().put(bf.getValue(), bf.getHitCount());
+                browser.close();
             }
+            
 
         }
         catch (RepositoryException ex)

Modified: magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2013-03-15 17:40:14 UTC (rev 4207)
+++ magnoliamodules/branches/magnolia44/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2013-04-02 21:03:01 UTC (rev 4208)
@@ -124,7 +124,7 @@
         log.debug("tagCloud freq: {}", tags);
         assertEquals(nodesNumber, tags.get("tag2"));
         time = System.currentTimeMillis();
-        tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, pathList[1], "tags", 1);
+        tags = TagCloudElFunctions.cached(ContentRepository.WEBSITE, pathList[1], "tags", 2);
         log.debug("Time: " + (System.currentTimeMillis() - time));
         log.debug("tagCloud freq: {}", tags);
         assertEquals(nodesNumber, tags.get("tag1 tag4"));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.