annotate servlet/src/digilib/io/DocuDirectory.java @ 750:4f5aaa0de456 jquery

removed synchronized from some methods
author robcast
date Sat, 05 Feb 2011 16:47:31 +0100
parents 6e8488acb499
children 5d3f74f378dd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
1 /* DocuDirectory -- Directory of DocuFilesets.
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
2
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
3 Digital Image Library servlet components
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
4
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
5 Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
6
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
7 This program is free software; you can redistribute it and/or modify it
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
8 under the terms of the GNU General Public License as published by the
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
9 Free Software Foundation; either version 2 of the License, or (at your
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
10 option) any later version.
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
11
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
12 Please read license.txt for the full details. A copy of the GPL
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
13 may be found at http://www.gnu.org/copyleft/lgpl.html
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
14
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
15 You should have received a copy of the GNU General Public License
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
16 along with this program; if not, write to the Free Software
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
18
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
19 * Created on 25.02.2003
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
20 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
21
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
22 package digilib.io;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
23
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
24 import java.io.File;
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
25 import java.io.IOException;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
26 import java.util.ArrayList;
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
27 import java.util.Collections;
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
28 import java.util.List;
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
29 import java.util.Map;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
30
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
31 import org.xml.sax.SAXException;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
32
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
33 import digilib.io.FileOps.FileClass;
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
34
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
35 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
36 * @author casties
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
37 */
149
04ad64b2137a Servlet version 1.14b1
robcast
parents: 130
diff changeset
38 public class DocuDirectory extends Directory {
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
39
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
40 /** list of files (DocuDirent) */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
41 private List<List<DocuDirent>> list = null;
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
42
571
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
43 /** default FileClass for unspecified calls */
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
44 public static FileClass defaultFileClass = FileClass.IMAGE;
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
45
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
46 /** directory object is valid (exists on disk) */
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
47 private boolean isValid = false;
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
48
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
49 /** reference of the parent DocuDirCache */
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
50 private DocuDirCache cache = null;
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
51
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
52 /** directory name (digilib canonical form) */
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
53 private String dirName = null;
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
54
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
55 /** directory metadata */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
56 private MetadataMap dirMeta = null;
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
57
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
58 /** state of metadata is valid */
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
59 private boolean metaChecked = false;
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
60
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
61 /** unresolved file metadata */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
62 private Map<String, MetadataMap> unresolvedFileMeta = null;
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
63
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
64 /** time of last access of this object (not the filesystem) */
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
65 private long objectATime = 0;
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
66
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
67 /** time directory was last modified on the file system */
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
68 private long dirMTime = 0;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
69
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
70 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
71 * Constructor with digilib directory path and a parent DocuDirCache.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
72 *
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
73 * Directory names at the given path are appended to the base directories
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
74 * from the cache. The directory is checked on disk and isValid is set.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
75 *
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
76 * @see readDir
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
77 *
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
78 * @param path
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
79 * digilib directory path name
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
80 * @param cache
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
81 * parent DocuDirCache
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
82 */
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
83 public DocuDirectory(String path, DocuDirCache cache) {
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
84 this.dirName = path;
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
85 this.cache = cache;
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
86 initDir();
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
87 checkDir();
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
88 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
89
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
90 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
91 * Sets and checks the dir object.
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
92 *
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
93 */
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
94 protected void initDir() {
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
95 String baseDirName = cache.getBaseDirNames()[0];
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
96 // clear directory list
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
97 FileClass[] fcs = FileClass.values();
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
98 list = new ArrayList<List<DocuDirent>>(fcs.length);
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
99 // create empty list for all classes
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
100 for (@SuppressWarnings("unused") FileClass fc: fcs) {
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
101 list.add(null);
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
102 }
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
103 isValid = false;
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
104 dirMTime = 0;
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
105 // the first directory has to exist
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
106 dir = new File(baseDirName, dirName);
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
107 }
156
688ad0b8b0fa Servlet version 1.16a2
robcast
parents: 152
diff changeset
108
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
109 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
110 * number of DocuFiles in this directory.
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
111 *
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
112 */
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
113 public int size() {
571
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
114 return size(defaultFileClass);
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
115 }
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
116
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
117 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
118 * number of files of this class in this directory.
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
119 *
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
120 * @param fc
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
121 * fileClass
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
122 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
123 public int size(FileClass fc) {
571
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
124 if (list != null) {
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
125 List<DocuDirent> l = list.get(fc.ordinal());
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
126 if (l != null) {
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
127 return l.size();
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
128 }
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
129 }
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
130 return 0;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
131 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
132
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
133 /**
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
134 * Returns the ImageFileSet at the index.
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
135 *
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
136 * @param index
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
137 * @return
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
138 */
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
139 public ImageFileset get(int index) {
571
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
140 return (ImageFileset) get(index, defaultFileClass);
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
141 }
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
142
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
143 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
144 * Returns the file of the class at the index.
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
145 *
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
146 * @param index
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
147 * @param fc
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
148 * fileClass
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
149 * @return
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
150 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
151 public DocuDirent get(int index, FileClass fc) {
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
152 if ((list == null) || (list.get(fc.ordinal()) == null) || (index >= list.get(fc.ordinal()).size())) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
153 return null;
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
154 }
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
155 return (DocuDirent) list.get(fc.ordinal()).get(index);
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
156 }
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
157
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
158 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
159 * Checks if the directory exists on the filesystem.
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
160 *
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
161 * Sets isValid.
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
162 *
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
163 * @return
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
164 */
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
165 public boolean checkDir() {
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
166 if (dir == null) {
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
167 initDir();
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
168 }
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
169 isValid = dir.isDirectory();
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
170 return isValid;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
171 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
172
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
173 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
174 * Read the filesystem directory and fill this object.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
175 *
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
176 * Clears the List and (re)reads all files.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
177 *
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
178 * @return boolean the directory exists
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
179 */
750
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 571
diff changeset
180 public boolean readDir() {
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
181 // check directory first
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
182 checkDir();
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
183 if (!isValid) {
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
184 return false;
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
185 }
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
186 // first file extension to try for scaled directories
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
187 String scalext = null;
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
188 // read all filenames
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 341
diff changeset
189 logger.debug("reading directory " + dir.getPath());
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
190 /*
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
191 * using ReadableFileFilter is safer (we won't get directories with file
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
192 * extensions) but slower.
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
193 */
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
194 File[] allFiles = null;
545
88ec23c2b2fb fixed problem after removing old settings
casties
parents: 536
diff changeset
195 // allFiles = dir.listFiles(new FileOps.ReadableFileFilter());
88ec23c2b2fb fixed problem after removing old settings
casties
parents: 536
diff changeset
196 allFiles = dir.listFiles();
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
197 //logger.debug(" done");
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
198 if (allFiles == null) {
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
199 // not a directory
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
200 return false;
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
201 }
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
202 // list of base dirs from the parent cache
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
203 String[] baseDirNames = cache.getBaseDirNames();
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
204 // number of base dirs
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
205 int nb = baseDirNames.length;
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
206 // array of base dirs
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
207 Directory[] dirs = new Directory[nb];
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
208 // first entry is this directory
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
209 dirs[0] = this;
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
210 // fill array with the remaining directories
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
211 for (int j = 1; j < nb; j++) {
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
212 File d = new File(baseDirNames[j], dirName);
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
213 if (d.isDirectory()) {
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
214 dirs[j] = new Directory(d);
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 341
diff changeset
215 logger.debug(" reading scaled directory " + d.getPath());
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
216 dirs[j].readDir();
295
90bab835fc25 Servlet version 1.5.0b -- the beginning of the next generation :-)
robcast
parents: 288
diff changeset
217 //logger.debug(" done");
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
218 }
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
219 }
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
220
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
221 // go through all file classes
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
222 //for (int classIdx = 0; classIdx < FileOps.NUM_CLASSES; classIdx++) {
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
223 for (FileClass fileClass: cache.getFileClasses()) {
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
224 //fileClass = cache.getFileClasses()[classIdx];
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
225 File[] fileList = FileOps.listFiles(allFiles, FileOps
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
226 .filterForClass(fileClass));
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
227 //logger.debug(" done");
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
228 // number of files in the directory
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
229 int numFiles = fileList.length;
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
230 if (numFiles > 0) {
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
231 // create new list
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
232 list.set(fileClass.ordinal(), new ArrayList<DocuDirent>(numFiles));
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
233 // sort the file names alphabetically and iterate the list
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 341
diff changeset
234 // Arrays.sort(fileList); // not needed <hertzhaft>
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
235 Map<Integer, Object> hints = FileOps.newHints(FileOps.HINT_BASEDIRS, dirs);
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
236 hints.put(FileOps.HINT_FILEEXT, scalext);
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
237 for (int i = 0; i < numFiles; i++) {
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
238 DocuDirent f = FileOps.fileForClass(fileClass, fileList[i],
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
239 hints);
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
240 // add the file to our list
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 341
diff changeset
241 // logger.debug(f.getName());
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 341
diff changeset
242
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
243 list.get(fileClass.ordinal()).add(f);
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
244 f.setParent(this);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
245 }
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
246 // we sort the inner ArrayList (the list of files not the list of file types)
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
247 // for binarySearch to work (DocuDirent's natural sort order is by filename)
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
248 Collections.sort(list.get(fileClass.ordinal()));
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
249 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
250 }
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
251 // clear the scaled directories
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
252 for (int j = 1; j < nb; j++) {
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
253 if (dirs[j] != null) {
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
254 dirs[j].clearFilenames();
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
255 }
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
256 }
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
257 // update number of cached files if this was the first time
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
258 if (dirMTime == 0) {
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
259 cache.numFiles += size();
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
260 }
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
261 dirMTime = dir.lastModified();
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
262 // read metadata as well
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
263 readMeta();
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
264 return isValid;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
265 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
266
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
267 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
268 * Check to see if the directory has been modified and reread if necessary.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
269 *
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
270 * @return boolean the directory is valid
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
271 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
272 public boolean refresh() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
273 if (isValid) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
274 if (dir.lastModified() > dirMTime) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
275 // on-disk modification time is more recent
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
276 readDir();
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
277 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
278 touch();
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
279 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
280 return isValid;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
281 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
282
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
283 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
284 * Read directory metadata.
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
285 *
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
286 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
287 public void readMeta() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
288 // check for directory metadata...
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
289 File mf = new File(dir, "index.meta");
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
290 if (mf.canRead()) {
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
291 XMLMetaLoader ml = new XMLMetaLoader();
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
292 try {
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
293 // read directory meta file
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
294 Map<String, MetadataMap> fileMeta = ml.loadURL(mf.getAbsolutePath());
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
295 if (fileMeta == null) {
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
296 return;
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
297 }
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
298 // meta for the directory itself is in the "" bin
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
299 dirMeta = fileMeta.remove("");
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
300 // read meta for files in this directory
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
301 readFileMeta(fileMeta, null);
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
302 // is there meta for other files left?
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
303 if (fileMeta.size() > 0) {
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
304 unresolvedFileMeta = fileMeta;
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
305 }
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
306 } catch (SAXException e) {
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
307 logger.warn("error parsing index.meta", e);
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
308 } catch (IOException e) {
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
309 logger.warn("error reading index.meta", e);
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
310 }
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
311 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
312 readParentMeta();
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
313 metaChecked = true;
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
314 }
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
315
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
316 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
317 * Read metadata from all known parent directories.
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
318 *
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
319 */
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
320 public void readParentMeta() {
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
321 // check the parent directories for additional file meta
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
322 Directory dd = parent;
156
688ad0b8b0fa Servlet version 1.16a2
robcast
parents: 152
diff changeset
323 String path = dir.getName();
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
324 while (dd != null) {
156
688ad0b8b0fa Servlet version 1.16a2
robcast
parents: 152
diff changeset
325 if (((DocuDirectory) dd).hasUnresolvedFileMeta()) {
688ad0b8b0fa Servlet version 1.16a2
robcast
parents: 152
diff changeset
326 readFileMeta(((DocuDirectory) dd).unresolvedFileMeta, path);
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
327 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
328 // prepend parent dir path
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
329 path = dd.dir.getName() + "/" + path;
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
330 // become next parent
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
331 dd = dd.parent;
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
332 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
333 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
334
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
335 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
336 * Read metadata for the files in this directory.
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
337 *
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
338 * Takes a Map with meta-information, adding the relative path before the
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
339 * lookup.
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
340 *
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
341 * @param fileMeta
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
342 * @param relPath
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
343 * @param fc
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
344 * fileClass
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
345 */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
346 protected void readFileMeta(Map<String,MetadataMap> fileMeta, String relPath) {
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
347 if (list == null) {
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
348 // there are no files
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
349 return;
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
350 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
351 String path = (relPath != null) ? (relPath + "/") : "";
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
352 // go through all file classes
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
353 for (FileClass fc: FileClass.values()) {
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
354 if (list.get(fc.ordinal()) == null) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
355 continue;
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
356 }
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
357 // iterate through the list of files in this directory
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
358 for (DocuDirent f: list.get(fc.ordinal())) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
359 // prepend path to the filename
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
360 String fn = path + f.getName();
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
361 // look up meta for this file and remove from dir
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
362 MetadataMap meta = fileMeta.remove(fn);
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
363 if (meta != null) {
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
364 // store meta in file
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
365 f.setFileMeta(meta);
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
366 }
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
367 }
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
368 }
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
369 }
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
370
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
371 protected void notifyChildMeta(MetadataMap childmeta) {
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
372 List<DocuDirectory> children = cache.getChildren(this.dirName, true);
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
373 if (children.size() > 0) {
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
374 /*for (DocuDirectory d: children) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
375 // TODO: finish this!
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
376 //((DocuDirectory) i.next()).readFileMeta()
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
377 }*/
130
c36944be0b58 Servlet Version 1.11a1with original size(!)
robcast
parents: 122
diff changeset
378 }
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
379 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
380
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
381 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
382 * Update access time.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
383 *
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
384 * @return long time of last access.
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
385 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
386 public long touch() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
387 long t = objectATime;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
388 objectATime = System.currentTimeMillis();
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
389 return t;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
390 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
391
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
392 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
393 * Searches for the file with the name <code>fn</code>.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
394 *
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
395 * Searches the directory for the file with the name <code>fn</code> and
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
396 * returns its index. Returns -1 if the file cannot be found.
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
397 *
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
398 * @param fn
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
399 * filename
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
400 * @param fc
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
401 * file class
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
402 * @return int index of file <code>fn</code>
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
403 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
404 public int indexOf(String fn) {
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
405 FileClass fc = FileOps.classForFilename(fn);
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
406 return indexOf(fn, fc);
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
407 }
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
408
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
409 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
410 * Searches for the file with the name <code>fn</code> and class fc.
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
411 *
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
412 * Searches the directory for the file with the name <code>fn</code> and
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
413 * returns its index. Returns -1 if the file cannot be found.
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
414 *
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
415 * @param fn
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
416 * filename
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
417 * @return int index of file <code>fn</code>
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
418 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
419 public int indexOf(String fn, FileClass fc) {
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
420 if (!isRead()) {
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
421 // read directory now
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
422 if (!readDir()) {
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
423 return -1;
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
424 }
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
425 }
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
426 List<DocuDirent> fileList = list.get(fc.ordinal());
246
aaf6eace011d Servlet version 1.19b4
robcast
parents: 233
diff changeset
427 // empty directory?
288
ffafe3e470fb Servlet version 1.22b2
robcast
parents: 282
diff changeset
428 if (fileList == null) {
246
aaf6eace011d Servlet version 1.19b4
robcast
parents: 233
diff changeset
429 return -1;
aaf6eace011d Servlet version 1.19b4
robcast
parents: 233
diff changeset
430 }
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 341
diff changeset
431
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
432 // search for exact match (DocuDirent does compareTo<String>)
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 341
diff changeset
433 // OBS: fileList needs to be sorted first (see )! <hertzhaft>
288
ffafe3e470fb Servlet version 1.22b2
robcast
parents: 282
diff changeset
434 int idx = Collections.binarySearch(fileList, fn);
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
435 if (idx >= 0) {
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
436 return idx;
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
437 } else {
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 341
diff changeset
438 logger.debug(fn + " not found by binarysearch");
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
439 // try closest matches without extension
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
440 idx = -idx - 1;
288
ffafe3e470fb Servlet version 1.22b2
robcast
parents: 282
diff changeset
441 if ((idx < fileList.size())
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
442 && isBasenameInList(fileList, idx, fn)) {
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
443 // idx matches
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
444 return idx;
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
445 } else if ((idx > 0)
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
446 && isBasenameInList(fileList, idx-1, fn)) {
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
447 // idx-1 matches
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
448 return idx - 1;
288
ffafe3e470fb Servlet version 1.22b2
robcast
parents: 282
diff changeset
449 } else if ((idx + 1 < fileList.size())
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
450 && isBasenameInList(fileList, idx+1, fn)) {
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
451 // idx+1 matches
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
452 return idx + 1;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
453 }
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
454
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
455 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
456 return -1;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
457 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
458
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
459 private boolean isBasenameInList(List<DocuDirent> fl, int idx, String fn) {
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
460 String dfn = FileOps.basename((fl.get(idx))
341
d10e4ce2a153 Servlet version 1.5.4b
robcast
parents: 295
diff changeset
461 .getName());
d10e4ce2a153 Servlet version 1.5.4b
robcast
parents: 295
diff changeset
462 return (dfn.equals(fn)||dfn.equals(FileOps.basename(fn)));
d10e4ce2a153 Servlet version 1.5.4b
robcast
parents: 295
diff changeset
463 }
d10e4ce2a153 Servlet version 1.5.4b
robcast
parents: 295
diff changeset
464
d10e4ce2a153 Servlet version 1.5.4b
robcast
parents: 295
diff changeset
465
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
466 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
467 * Finds the DocuDirent with the name <code>fn</code>.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
468 *
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
469 * Searches the directory for the DocuDirent with the name <code>fn</code>
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
470 * and returns it. Returns null if the file cannot be found.
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
471 *
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
472 * @param fn
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
473 * filename
187
b3f9a7f646c5 Servlet version 1.18b3 new Raster servlet
robcast
parents: 181
diff changeset
474 * @return DocuDirent
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
475 */
187
b3f9a7f646c5 Servlet version 1.18b3 new Raster servlet
robcast
parents: 181
diff changeset
476 public DocuDirent find(String fn) {
571
6e8488acb499 fixed default file class for DocuDir.size()
robcast
parents: 563
diff changeset
477 return find(fn, defaultFileClass);
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
478 }
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
479
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
480 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
481 * Finds the DocuDirent with the name <code>fn</code> and class
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
482 * <code>fc</code>.
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
483 *
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
484 * Searches the directory for the DocuDirent with the name <code>fn</code>
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
485 * and returns it. Returns null if the file cannot be found.
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
486 *
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
487 * @param fn
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
488 * filename
187
b3f9a7f646c5 Servlet version 1.18b3 new Raster servlet
robcast
parents: 181
diff changeset
489 * @return DocuDirent
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
490 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
491 public DocuDirent find(String fn, FileClass fc) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
492 int i = indexOf(fn, fc);
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
493 if (i >= 0) {
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
494 return (DocuDirent) list.get(fc.ordinal()).get(i);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
495 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
496 return null;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
497 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
498
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
499 /**
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
500 * Returns the digilib canonical name.
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
501 *
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
502 * @return
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
503 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
504 public String getDirName() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
505 return dirName;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
506 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
507
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
508 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
509 * The directory is valid (exists on disk).
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
510 *
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
511 * @return boolean
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
512 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
513 public boolean isValid() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
514 return isValid;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
515 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
516
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
517 /**
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
518 * The directory has been read from disk.
159
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
519 *
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
520 * @return
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
521 */
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
522 public boolean isRead() {
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
523 return (dirMTime != 0);
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
524 }
e743b853efca servlet version 1.16a4
robcast
parents: 156
diff changeset
525
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
526 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
527 * @return long
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
528 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
529 public long getAccessTime() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
530 return objectATime;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
531 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
532
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
533 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
534 * @return Hashtable
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
535 */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
536 public MetadataMap getDirMeta() {
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
537 return dirMeta;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
538 }
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
539
233
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
540 /**
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
541 * Checks metadata
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
542 *
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
543 */
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
544 public void checkMeta() {
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
545 if (metaChecked) {
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
546 return;
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
547 } else {
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
548 readMeta();
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
549 }
e40d8b2e3978 Servlet version 1.19b1 -- with context metadata
robcast
parents: 220
diff changeset
550 }
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
551
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
552 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
553 * @return long
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
554 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
555 public long getDirMTime() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
556 return dirMTime;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
557 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
558
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
559 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
560 * Sets the dirMeta.
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
561 *
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
562 * @param dirMeta
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
563 * The dirMeta to set
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
564 */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
565 public void setDirMeta(MetadataMap dirMeta) {
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
566 this.dirMeta = dirMeta;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
567 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
568
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
569 public boolean hasUnresolvedFileMeta() {
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
570 return (this.unresolvedFileMeta != null);
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
571 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 149
diff changeset
572
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
573 }