[Openutils-svn] SF.net SVN: openutils:[1985] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media

[<die...@us...>]

Revision: 1985
          http://openutils.svn.sourceforge.net/openutils/?rev=1985&view=rev
Author:   diego_schivo
Date:     2010-02-18 11:57:28 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
MEDIA-107 refactoring

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-02-18 11:52:59 UTC (rev 1984)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java	2010-02-18 11:57:28 UTC (rev 1985)
@@ -348,41 +348,10 @@
      * @param type if specified restricts the search to the type
      * @return found medias
      * @throws RepositoryException exception working on repository
-     * @deprecated, use find(String, String, String, boolean)
      */
-    @SuppressWarnings("unchecked")
     public Collection<Content> search(String text, final String type) throws RepositoryException
     {
-        QueryManager qm = MgnlContext.getQueryManager(MediaModule.REPO);
-        StringBuilder sb = new StringBuilder();
-        sb.append("//*[jcr:contains(.,'");
-        sb.append(StringUtils.replace(text, "'", "''"));
-        sb.append("')] order by @jcr:score descending");
-        Query q = qm.createQuery(sb.toString(), Query.XPATH);
-        QueryResult qr = q.execute();
-        Collection c = qr.getContent(MediaConfigurationManager.MGNL_MEDIA_TYPE);
-
-        if (!StringUtils.isBlank(type))
-        {
-            CollectionUtils.filter(c, new Predicate()
-            {
-
-                /**
-                 * {@inheritDoc}
-                 */
-                public boolean evaluate(Object object)
-                {
-                    if (object instanceof Content)
-                    {
-                        return NodeDataUtil.getString((Content) object, "type").equals(type);
-                    }
-                    return false;
-                }
-
-            });
-        }
-
-        return c;
+        return find(null, type, text, true);
     }
 
     @SuppressWarnings("unchecked")

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-02-18 11:52:59 UTC (rev 1984)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-02-18 11:57:28 UTC (rev 1985)
@@ -186,7 +186,7 @@
                     path,
                     mtc.getName(),
                     search,
-                    StringUtils.isBlank(path));
+                    StringUtils.isNotBlank(search));
                 numberOfMedia.put(mtc.getName(), c.size());
             }
             catch (RepositoryException e)


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