annotate servlet/src/digilib/io/DocuDirectory.java @ 577:3e3e1b7d659f stream

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