X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2FFilesystemIndexer.java;h=f7cb130a5f6a884ea527d5ca087d19f98c783c5f;hb=bc2cdc4cc3316a5fb66f4372e3708b610c8f68b0;hp=61b9027b28cee8868d61548bbebe548f821f58f3;hpb=99bc9002a93c8ab224934032a1a5fe0c00d5de96;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
index 61b9027..f7cb130 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/FilesystemIndexer.java
@@ -12,7 +12,6 @@ package eu.svjatoslav.meviz.htmlindexer;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -25,8 +24,6 @@ import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension;
 import eu.svjatoslav.meviz.htmlindexer.metadata.DirectoryMetadata;
 import eu.svjatoslav.meviz.htmlindexer.metadata.MetadadaHelper;
 import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.AbstractFile;
-import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.DirectoryFile;
-import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.GeneralFile;
 import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.Picture;
 
 /**
@@ -102,10 +99,10 @@ public class FilesystemIndexer extends AbstractIndexer {
 
 				if (canWriteIndexFile(indexFile)) {
 
-					indexForLayout(layout);
+					compileHtml(layout, metadata);
 
 					IOHelper.overwriteFileIfContentDiffers(indexFile, layout
-							.getHtml(true, true).getBytes());
+							.getHtml(true, true, metadata).getBytes());
 				}
 			} catch (final Exception e) {
 				logger.error("Error writing index file. ", e);
@@ -162,24 +159,6 @@ public class FilesystemIndexer extends AbstractIndexer {
 		+ UrlParamEncoder.encode(thumbnailFileName);
 	}
 
-	public void indexForLayout(final Layout layout)
-			throws UnsupportedEncodingException {
-
-		for (final AbstractFile abstractFile : metadata.getFiles())
-			if (abstractFile instanceof GeneralFile) {
-
-				if (isOgv(abstractFile.getFileExtension()))
-					layout.enlistOgv(abstractFile);
-				else
-					layout.enlistFile(abstractFile);
-
-			} else if (abstractFile instanceof Picture)
-				layout.enlistImage((Picture) abstractFile);
-			else if (abstractFile instanceof DirectoryFile)
-				layout.enlistDirectory(abstractFile);
-
-	}
-
 	public void initializeLayouts() {
 
 		layouts = Utils.getLayouts();