openutils-svn

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

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

Revision: 3231
          http://openutils.svn.sourceforge.net/openutils/?rev=3231&view=rev
Author:   diego_schivo
Date:     2011-01-13 10:21:11 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
PIRMEDIA-202 modified status search

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java

Added Paths:
-----------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java

Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java	                        (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatusModified.java	2011-01-13 10:21:11 UTC (rev 3231)
@@ -0,0 +1,94 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
+
+import info.magnolia.cms.core.MetaData;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Criterion;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class SearchFilterStatusModified extends SearchFilterAbstract
+{
+    private static final String META_DATA_MGNL_ACTIVATED = "MetaData/@mgnl:" + MetaData.ACTIVATED;
+
+    private static final String META_DATA_MGNL_LAST_ACTION = "MetaData/@mgnl:" + MetaData.LAST_ACTION;
+
+    private static final String META_DATA_MGNL_LAST_MODIFIED = "MetaData/@mgnl:" + MetaData.LAST_MODIFIED;
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<Criterion> getCriterionList(String parameter, HttpServletRequest request)
+    {
+        String[] values = (String[]) request.getParameterMap().get(parameter);
+        List<Criterion> criterionList = new ArrayList<Criterion>();
+
+        if (values != null && values.length > 0 && StringUtils.isNotBlank(values[0]))
+        {
+            criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, "true"));
+
+            Calendar date = getDate(values[0]);
+            criterionList.add(Restrictions.le(META_DATA_MGNL_LAST_ACTION, date));
+            criterionList.add(Restrictions.gt(META_DATA_MGNL_LAST_MODIFIED, date));
+        }
+        return criterionList;
+    }
+
+    private Calendar getDate(String date)
+    {
+        Calendar cal = Calendar.getInstance();
+
+        Pattern datePattern = Pattern.compile("(\\d{4})-(\\d{2})-(\\d{2})");
+        Matcher dateMatcher = datePattern.matcher(date);
+
+        try
+        {
+            if (dateMatcher.find())
+            {
+                cal.set(
+                    Integer.parseInt(dateMatcher.group(1)),
+                    Integer.parseInt(dateMatcher.group(2)),
+                    Integer.parseInt(dateMatcher.group(3)));
+            }
+        }
+        catch (Exception e)
+        {
+            log.error("Invalid date: {}", date);
+        }
+
+        return cal;
+    }
+}

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java	2011-01-13 10:05:42 UTC (rev 3230)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterUUID.java	2011-01-13 10:21:11 UTC (rev 3231)
@@ -1,3 +1,22 @@
+/**
+ *
+ * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package net.sourceforge.openutils.mgnlmedia.media.advancedsearch;
 
 import java.util.ArrayList;


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

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

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

Revision: 3235
          http://openutils.svn.sourceforge.net/openutils/?rev=3235&view=rev
Author:   diego_schivo
Date:     2011-01-13 11:09:27 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
PIRMEDIA-202 base path search

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java	2011-01-13 11:01:09 UTC (rev 3234)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilter.java	2011-01-13 11:09:27 UTC (rev 3235)
@@ -33,5 +33,7 @@
 public interface SearchFilter
 {
 
+    String getBasePath(String parameter, HttpServletRequest request);
+
     List<Criterion> getCriterionList(String parameter, HttpServletRequest request);
 }

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java	2011-01-13 11:01:09 UTC (rev 3234)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterAbstract.java	2011-01-13 11:09:27 UTC (rev 3235)
@@ -67,6 +67,14 @@
     /**
      * {@inheritDoc}
      */
+    public String getBasePath(String parameter, HttpServletRequest request)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     @SuppressWarnings("unchecked")
     public List<Criterion> getCriterionList(String parameter, HttpServletRequest request)
     {

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java	2011-01-13 11:01:09 UTC (rev 3234)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java	2011-01-13 11:09:27 UTC (rev 3235)
@@ -110,19 +110,14 @@
             .setWorkspace(MediaModule.REPO)
             .add(Restrictions.eq("@jcr:primaryType", MediaConfigurationManager.MEDIA.getSystemName()));
 
-        // base path
-        String searchPath = StringUtils.removeEnd(StringUtils.defaultString(path, defaultBasePath), "/")
-            + "/"
-            + (descendants ? "/" : StringUtils.EMPTY)
-            + "*";
-        c.setBasePath("/jcr:root/" + StringUtils.removeStart(searchPath, "/"));
-
         // media type
         if (!StringUtils.isEmpty(mediaType))
         {
             c.add(Restrictions.eq("@type", mediaType));
         }
 
+        path = StringUtils.defaultString(path, defaultBasePath);
+
         // filters
         for (String key : filters.keySet())
         {
@@ -131,13 +126,21 @@
                 // restriction on type already set
                 continue;
             }
-            List<Criterion> criterionList = filters.get(key).getCriterionList(key, request);
-            for (Criterion criterion : criterionList)
+            SearchFilter filter = filters.get(key);
+            path = StringUtils.defaultString(filter.getBasePath(key, request), path);
+            for (Criterion criterion : filter.getCriterionList(key, request))
             {
                 c.add(criterion);
             }
         }
 
+        // base path
+        String searchPath = StringUtils.removeEnd(path, "/")
+            + "/"
+            + (descendants ? "/" : StringUtils.EMPTY)
+            + "*";
+        c.setBasePath("/jcr:root/" + StringUtils.removeStart(searchPath, "/"));
+
         // sorting
         if (sorting == SortMode.SCORE)
         {


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