projects
/
meviz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added intellij settings
[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
199f789
..
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.BufferedInputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
+import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.MalformedURLException;
import java.net.URL;
+import java.net.URLEncoder;
import java.util.List;
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;
import eu.svjatoslav.meviz.htmlindexer.layouts.MixedLayout;
import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
@@
-25,16
+26,31
@@
public class WebIndexer extends AbstractIndexer {
this.jspPath = jspPath;
}
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) {
@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 {
}
public String getHtml(String requestPath) throws MalformedURLException,
IOException, ClassNotFoundException {
+ if (requestPath == null)
+ requestPath = "";
+
if (requestPath.equals("/"))
requestPath = "";
if (requestPath.equals("/"))
requestPath = "";
@@
-43,11
+59,11
@@
public class WebIndexer extends AbstractIndexer {
requestPath);
layout.init("Photos", context.getLocalPathComponents(), this, context);
requestPath);
layout.init("Photos", context.getLocalPathComponents(), this, context);
- final DirectoryMetadata
metadata
= getMetadataForPath(requestPath);
+ final DirectoryMetadata
directory
= getMetadataForPath(requestPath);
- compileHtml(layout,
metadata
);
+ compileHtml(layout,
directory
);
- return layout.getHtml(false, false);
+ return layout.getHtml(false, false
, directory
);
}
public DirectoryMetadata getMetadataForPath(final String requestPath)
}
public DirectoryMetadata getMetadataForPath(final String requestPath)
@@
-56,7
+72,7
@@
public class WebIndexer extends AbstractIndexer {
final StringBuffer urlStringBuffer = new StringBuffer();
urlStringBuffer.append(globalPrefix);
final StringBuffer urlStringBuffer = new StringBuffer();
urlStringBuffer.append(globalPrefix);
- urlStringBuffer.append(U
rlParamEncoder.e
ncode(requestPath));
+ urlStringBuffer.append(U
tils.urlE
ncode(requestPath));
urlStringBuffer.append("/.thumbnails/metadata_6.dat");
final String urlString = urlStringBuffer.toString();
urlStringBuffer.append("/.thumbnails/metadata_6.dat");
final String urlString = urlStringBuffer.toString();
@@
-114,7
+130,7
@@
public class WebIndexer extends AbstractIndexer {
return context.getGlobalUrl() + context.getLocalUrl() + "/"
+ Constants.THUMBNAILS_DIRECTORY_NAME + "/"
return context.getGlobalUrl() + context.getLocalUrl() + "/"
+ Constants.THUMBNAILS_DIRECTORY_NAME + "/"
- + U
rlParamEncoder.e
ncode(thumbnailFileName);
+ + U
tils.urlE
ncode(thumbnailFileName);
}
}
}
}