Thread: [Openutils-svn] SF.net SVN: openutils:[1311] trunk/openutils-mgnlmedia/src/main/java/net/ sourcefo

Brought to you by: fcarone, fgiust, molaschi

openutils-svn

[Openutils-svn] SF.net SVN: openutils:[1311] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

From: <mol...@us...> - 2009-08-25 16:15:27

Revision: 1311
          http://openutils.svn.sourceforge.net/openutils/?rev=1311&view=rev
Author:   molaschi
Date:     2009-08-25 16:15:20 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
fix language handling for title and description

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2009-08-25 13:38:59 UTC (rev 1310)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2009-08-25 16:15:20 UTC (rev 1311)
@@ -51,15 +51,26 @@
         Locale locale = MgnlContext.getLocale();
         String language = locale.getLanguage().toLowerCase();
         String languageCountry = language + "_" + locale.getCountry().toLowerCase();
-        if (LANGUAGES.contains(languageCountry))
+        try
         {
-            return NodeDataUtil.getString(media, property + "-" + languageCountry);
+            if (LANGUAGES.contains(languageCountry) && media.hasNodeData(property + "-" + languageCountry))
+            {
+                return NodeDataUtil.getString(media, property + "-" + languageCountry);
+            }
+            else if (LANGUAGES.contains(language) && media.hasNodeData(property + "-" + language))
+            {
+                return NodeDataUtil.getString(media, property + "-" + language);
+            }
+            else if (LANGUAGES.contains(language) && media.hasNodeData(property + "-en"))
+            {
+                return NodeDataUtil.getString(media, property + "-" + language);
+            }
         }
-        else if (LANGUAGES.contains(language))
+        catch (RepositoryException ex)
         {
-            return NodeDataUtil.getString(media, property + "-" + language);
+            log.error(ex.getMessage(), ex);
         }
-        return NodeDataUtil.getString(media, property + "-en");
+        return NodeDataUtil.getString(media, property);
     }
 
     /**


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

[Openutils-svn] SF.net SVN: openutils:[1988] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

From: <die...@us...> - 2010-02-18 14:39:57

Revision: 1988
          http://openutils.svn.sourceforge.net/openutils/?rev=1988&view=rev
Author:   diego_schivo
Date:     2010-02-18 14:39:49 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
MEDIA-100 The values should be saved in properties conventionally named after the main field name

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-02-18 13:48:10 UTC (rev 1987)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-02-18 14:39:49 UTC (rev 1988)
@@ -103,6 +103,17 @@
         NodeData nd = NodeDataUtil.getOrCreate(parentNode, name);
         nd.setValue(uuid);
 
+        for (String dimKey : new String[]{
+            "width", "height"
+        })
+        {
+            String paramName = name + '_' + dimKey;
+            int dimValue = NumberUtils.toInt(request.getParameter(paramName), -1);
+            if (dimValue >= 0)
+            {
+                NodeDataUtil.getOrCreateAndSet(parentNode, paramName, dimValue);
+            }
+        }
         return true;
     }
 


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

[Openutils-svn] SF.net SVN: openutils:[1990] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

From: <die...@us...> - 2010-02-18 15:11:26

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

Log Message:
-----------
MEDIA-100 width/height saved as Long node-data

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-02-18 15:09:38 UTC (rev 1989)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-02-18 15:11:20 UTC (rev 1990)
@@ -108,7 +108,7 @@
         })
         {
             String paramName = name + '_' + dimKey;
-            int dimValue = NumberUtils.toInt(request.getParameter(paramName), -1);
+            long dimValue = NumberUtils.toLong(request.getParameter(paramName), -1);
             if (dimValue >= 0)
             {
                 NodeDataUtil.getOrCreateAndSet(parentNode, paramName, dimValue);


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

[Openutils-svn] SF.net SVN: openutils:[2275] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

From: <fg...@us...> - 2010-04-05 13:52:04

Revision: 2275
          http://openutils.svn.sourceforge.net/openutils/?rev=2275&view=rev
Author:   fgiust
Date:     2010-04-05 13:51:54 +0000 (Mon, 05 Apr 2010)

Log Message:
-----------
don't set a template when uploading images in a zip file

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-04-04 17:31:16 UTC (rev 2274)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-04-05 13:51:54 UTC (rev 2275)
@@ -114,16 +114,13 @@
     {
         Document doc = new Document(f, type + extension);
         doc.setExtention(extension);
-        SaveHandlerImpl.saveDocument(media, doc, ORGINAL_NODEDATA_NAME, cleanFileName, cleanFileName
-            + "_"
-            + FileProperties.PROPERTY_TEMPLATE);
+        SaveHandlerImpl.saveDocument(media, doc, ORGINAL_NODEDATA_NAME, cleanFileName, null);
         this.onPostSave(media);
     }
 
     /**
      * {@inheritDoc}
      */
-    @SuppressWarnings("unchecked")
     public boolean onPostSave(Content media)
     {
         try


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

[Openutils-svn] SF.net SVN: openutils:[2278] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

From: <fg...@us...> - 2010-04-05 14:48:42

Revision: 2278
          http://openutils.svn.sourceforge.net/openutils/?rev=2278&view=rev
Author:   fgiust
Date:     2010-04-05 14:48:33 +0000 (Mon, 05 Apr 2010)

Log Message:
-----------
optimize imports

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-04-05 14:37:06 UTC (rev 2277)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-04-05 14:48:33 UTC (rev 2278)
@@ -40,7 +40,6 @@
 import javax.servlet.http.HttpServletRequest;
 
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
-import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler;
 


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

[Openutils-svn] SF.net SVN: openutils:[2279] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

From: <fg...@us...> - 2010-04-05 15:03:45

Revision: 2279
          http://openutils.svn.sourceforge.net/openutils/?rev=2279&view=rev
Author:   fgiust
Date:     2010-04-05 15:03:39 +0000 (Mon, 05 Apr 2010)

Log Message:
-----------
don't mess up with properties called tags*, there is no reason to convert them to lowercase here

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-04-05 14:48:33 UTC (rev 2278)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-04-05 15:03:39 UTC (rev 2279)
@@ -145,22 +145,6 @@
             log.error("Error removing resolutions", ex);
         }
 
-        Collection<NodeData> nds = media.getNodeDataCollection("tags*");
-        for (NodeData nd : nds)
-        {
-            if (nd.getString() != null)
-            {
-                try
-                {
-                    nd.setValue(nd.getString().toLowerCase());
-                    nd.save();
-                }
-                catch (RepositoryException ex)
-                {
-                    log.warn("Error putting property to lower case", ex);
-                }
-            }
-        }
         return true;
     }
 


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

[Openutils-svn] SF.net SVN: openutils:[2884] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

From: <die...@us...> - 2010-08-25 07:43:09

Revision: 2884
          http://openutils.svn.sourceforge.net/openutils/?rev=2884&view=rev
Author:   diego_schivo
Date:     2010-08-25 07:43:03 +0000 (Wed, 25 Aug 2010)

Log Message:
-----------
MEDIA-168 Sort by "the displayed name of the media" instead that on the "title" property

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-08-25 07:32:53 UTC (rev 2883)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-08-25 07:43:03 UTC (rev 2884)
@@ -140,7 +140,9 @@
     {
         try
         {
-            String name = StringUtils.substringAfterLast(getFilename(media), "/");
+            String filename = getFilename(media);
+            int p = StringUtils.lastIndexOf(filename, '/');
+            String name = p != -1 ? filename.substring(p + 1) : filename;
             if (!StringUtils.equals(name, NodeDataUtil.getString(media, METADATA_NAME)))
             {
                 NodeDataUtil.getOrCreateAndSet(media, METADATA_NAME, name);


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

[Openutils-svn] SF.net SVN: openutils:[3042] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

From: <die...@us...> - 2010-09-11 05:01:24

Revision: 3042
          http://openutils.svn.sourceforge.net/openutils/?rev=3042&view=rev
Author:   diego_schivo
Date:     2010-09-11 05:01:18 +0000 (Sat, 11 Sep 2010)

Log Message:
-----------
MEDIA-179 the media name could be lowercase at saving

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-09-11 04:44:44 UTC (rev 3041)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2010-09-11 05:01:18 UTC (rev 3042)
@@ -143,6 +143,8 @@
             String filename = getFilename(media);
             int p = StringUtils.lastIndexOf(filename, '/');
             String name = p != -1 ? filename.substring(p + 1) : filename;
+            // lowercase at saving for case insensitive sorting
+            name = StringUtils.lowerCase(name);
             if (!StringUtils.equals(name, NodeDataUtil.getString(media, METADATA_NAME)))
             {
                 NodeDataUtil.getOrCreateAndSet(media, METADATA_NAME, name);


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

[Openutils-svn] SF.net SVN: openutils:[3541] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

From: <die...@us...> - 2011-06-16 13:31:09

Revision: 3541
          http://openutils.svn.sourceforge.net/openutils/?rev=3541&view=rev
Author:   diego_schivo
Date:     2011-06-16 13:31:03 +0000 (Thu, 16 Jun 2011)

Log Message:
-----------
MEDIA-235 url encode

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2011-06-16 11:20:53 UTC (rev 3540)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2011-06-16 13:31:03 UTC (rev 3541)
@@ -30,6 +30,8 @@
 import info.magnolia.module.admininterface.SaveHandlerImpl;
 
 import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -228,12 +230,21 @@
      */
     public String getUrl(Content media, Map<String, String> options)
     {
+        String filenameEncoded = getFullFilename(media);
+        try
+        {
+            filenameEncoded = URLEncoder.encode(filenameEncoded, "UTF-8");
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            // should never happen
+        }
         return MediaConfigurationManager.getInstance().getURIMappingPrefix()
             + media.getHandle()
             + "/"
             + ORGINAL_NODEDATA_NAME
             + "/"
-            + getFullFilename(media);
+            + filenameEncoded;
     }
 
     /**


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