use latest svjatoslavcommons

[meviz.git] / src / main / java / eu / svjatoslav / meviz / htmlindexer / WebIndexer.java

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
index acc1a28..7cf1d20 100644 (file)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/WebIndexer.java
@@ -3,11 +3,12 @@ package eu.svjatoslav.meviz.htmlindexer;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.List;
 
-import eu.svjatoslav.commons.network.UrlParamEncoder;
 import eu.svjatoslav.meviz.htmlindexer.layouts.MixedLayout;
 import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
 import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
@@ -25,15 +26,27 @@ public class WebIndexer extends AbstractIndexer {
                this.jspPath = jspPath;
        }
 
+       @Override
+       public void compileHtml(final Layout layout,
+                       final DirectoryMetadata directory)
+                       throws UnsupportedEncodingException {
+               super.compileHtml(layout, directory);
+       }
+
        @Override
        public String getDirectoryUrl(final AbstractFile directory,
                        final IndexingContext context) {
-               return jspPath + context.getLocalUrl() + "/"
-                               + UrlParamEncoder.encode(directory.fileName);
+
+               try {
+                       return jspPath + context.getLocalUrl() + "/"
+                                       + URLEncoder.encode(directory.fileName, "UTF-8");
+               } catch (final UnsupportedEncodingException e) {
+                       throw new RuntimeException(e);
+               }
        }
 
        public String getHtml(String requestPath) throws MalformedURLException,
-       IOException, ClassNotFoundException {
+                       IOException, ClassNotFoundException {
 
                if (requestPath == null)
                        requestPath = "";
@@ -59,7 +72,7 @@ public class WebIndexer extends AbstractIndexer {
                final StringBuffer urlStringBuffer = new StringBuffer();
 
                urlStringBuffer.append(globalPrefix);
-               urlStringBuffer.append(UrlParamEncoder.encode(requestPath));
+               urlStringBuffer.append(Utils.urlEncode(requestPath));
                urlStringBuffer.append("/.thumbnails/metadata_6.dat");
 
                final String urlString = urlStringBuffer.toString();
@@ -110,14 +123,14 @@ public class WebIndexer extends AbstractIndexer {
                // file path
                if (picture.getDimensions().equals(desiredDimension))
                        return context.getGlobalUrl() + context.getLocalUrl() + "/"
-                       + picture.fileName;
+                                       + picture.fileName;
 
                final String thumbnailFileName = picture
                                .getRelativeThumbnailFileName(desiredDimension);
 
                return context.getGlobalUrl() + context.getLocalUrl() + "/"
-               + Constants.THUMBNAILS_DIRECTORY_NAME + "/"
-               + UrlParamEncoder.encode(thumbnailFileName);
+                               + Constants.THUMBNAILS_DIRECTORY_NAME + "/"
+                               + Utils.urlEncode(thumbnailFileName);
        }
 
 }