annotate common/src/main/java/digilib/io/DocuDirCache.java @ 1158:2ee261676828 default tip

better out-of-the box experience: * digilib works without config files using sensible defaults * new sample images folder used by default * config files moved to templates
author robcast
date Tue, 19 Feb 2013 17:32:25 +0100
parents 7bcc6765c209
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
1 /*
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
2 * DocuDirCache.java
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
3 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
4 * Digital Image Library servlet components
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
5 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
6 * Copyright (C) 2003 Robert Casties (robcast@mail.berlios.de)
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
7 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
8 * This program is free software; you can redistribute it and/or modify it
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
9 * under the terms of the GNU General Public License as published by the Free
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
10 * Software Foundation; either version 2 of the License, or (at your option)
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
11 * any later version.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
12 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
13 * Please read license.txt for the full details. A copy of the GPL may be found
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
14 * at http://www.gnu.org/copyleft/lgpl.html
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
15 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
16 * You should have received a copy of the GNU General Public License along with
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
17 * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
18 * Place, Suite 330, Boston, MA 02111-1307 USA
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
19 *
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
20 * Created on 03.03.2003
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
21 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
22
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
23 package digilib.io;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
24
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
25 import java.io.File;
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
26 import java.util.LinkedList;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
27 import java.util.List;
758
485b85f6e097 fixed jsp to work with new classes.
robcast
parents: 750
diff changeset
28 import java.util.concurrent.ConcurrentHashMap;
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
29 import java.util.concurrent.ConcurrentMap;
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
30 import java.util.concurrent.atomic.AtomicInteger;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
31
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 176
diff changeset
32 import org.apache.log4j.Logger;
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 176
diff changeset
33
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
34 import digilib.io.FileOps.FileClass;
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
35 import digilib.servlet.DigilibConfiguration;
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
36
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
37 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
38 * @author casties
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
39 */
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
40 public class DocuDirCache {
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
41
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 176
diff changeset
42 /** general logger for this class */
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
43 Logger logger = Logger.getLogger(this.getClass());
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
44
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
45 /** HashMap of directories */
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
46 ConcurrentMap<String, DocuDirectory> map = new ConcurrentHashMap<String, DocuDirectory>();
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
47
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
48 /** names of base directories */
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
49 String[] baseDirNames = null;
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
50
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
51 /** array of allowed file classes (image/text) */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
52 private FileClass[] fileClasses = null;
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
53
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
54 /** number of files in the whole cache (approximate) */
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
55 protected AtomicInteger numImgFiles = new AtomicInteger(0);
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
56
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
57 /** number of cache hits */
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
58 protected AtomicInteger hits = new AtomicInteger(0);
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
59
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
60 /** number of cache misses */
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
61 protected AtomicInteger misses = new AtomicInteger(0);
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
62
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
63 /** the root directory element */
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
64 public static Directory ROOT = null;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
65
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
66 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
67 * Constructor with array of base directory names and file classes.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
68 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
69 * @param bd
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
70 * base directory names
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
71 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
72 public DocuDirCache(String[] bd, FileClass[] fcs,
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
73 DigilibConfiguration dlConfig) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
74 baseDirNames = bd;
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
75 this.fileClasses = fcs;
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
76 }
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
77
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
78 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
79 * Constructor with array of base directory names.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
80 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
81 * @param bd
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
82 * base directory names
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
83 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
84 public DocuDirCache(String[] bd) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
85 baseDirNames = bd;
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
86 // default file class is CLASS_IMAGE
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
87 fileClasses = new FileClass[] { FileClass.IMAGE };
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
88 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
89
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
90 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
91 * The number of directories in the cache.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
92 *
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
93 * @return
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
94 */
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
95 public int size() {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
96 return (map != null) ? map.size() : 0;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
97 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
98
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
99 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
100 * Add a DocuDirectory to the cache.
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
101 * Always returns the correct Object from the cache,
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
102 * either newdir one or another one.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
103 *
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
104 * @param newdir
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
105 * @return dir
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
106 */
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
107 public DocuDirectory put(DocuDirectory newdir) {
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
108 String s = newdir.getDirName();
750
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 563
diff changeset
109 logger.debug("DocuDirCache.put for "+s+" in "+this);
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
110 DocuDirectory olddir = map.putIfAbsent(s, newdir);
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
111 if (olddir != null) {
197
bb4ed821d06e Servlet version 1.18b6
robcast
parents: 187
diff changeset
112 logger.warn("Duplicate key in DocuDirCache.put -- ignoring!");
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
113 return olddir;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
114 }
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
115 numImgFiles.addAndGet(newdir.size(FileClass.IMAGE));
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
116 return newdir;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
117 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
118
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
119 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
120 * Add a directory to the cache and check its parents.
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
121 * Always returns the correct Object from the cache,
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
122 * either newDir one or another one.
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
123 *
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
124 * @param newDir
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
125 * @return dir
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
126 */
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
127 public DocuDirectory putDir(DocuDirectory newDir) {
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
128 DocuDirectory dd = put(newDir);
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
129 if (dd.getParent() == null) {
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
130 // no parent link yet
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
131 String parent = FileOps.parent(newDir.getDirName());
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
132 if (parent != "") {
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
133 // check the parent in the cache
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
134 DocuDirectory pd = map.get(parent);
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
135 if (pd == null) {
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
136 // the parent is unknown
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
137 pd = new DocuDirectory(parent, this);
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
138 pd = putDir(pd);
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
139 }
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
140 newDir.setParent(pd);
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
141 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
142 }
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
143 return dd;
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
144 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
145
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
146 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
147 * Get a list with all children of a directory.
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
148 *
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
149 * Returns a List of DocuDirectory's. Returns an empty List if the directory
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
150 * has no children. If recurse is false then only direct children are
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
151 * returned.
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
152 *
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
153 * @param dirname
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
154 * @param recurse
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
155 * find all children and their children.
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
156 * @return
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
157 */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
158 public List<DocuDirectory> getChildren(String dirname, boolean recurse) {
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
159 List<DocuDirectory> l = new LinkedList<DocuDirectory>();
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
160 for (DocuDirectory dd: map.values()) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
161 if (recurse) {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
162 if (dd.getDirName().startsWith(dirname)) {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
163 l.add(dd);
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
164 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
165 } else {
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
166 if (FileOps.parent(dd.getDirName()).equals(dirname)) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
167 l.add(dd);
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
168 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
169 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
170 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
171 return l;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
172 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
173
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
174 /**
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
175 * Returns the DocuDirent with the pathname <code>fn</code> and the index
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
176 * <code>in</code> and the class <code>fc</code>.
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
177 *
187
b3f9a7f646c5 Servlet version 1.18b3 new Raster servlet
robcast
parents: 181
diff changeset
178 * If <code>fn</code> is a file then the corresponding DocuDirent is
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
179 * returned and the index is ignored.
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
180 *
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
181 * @param fn
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
182 * digilib pathname
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
183 * @param in
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
184 * file index
246
aaf6eace011d Servlet version 1.19b4
robcast
parents: 209
diff changeset
185 * @param fc
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
186 * file class
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
187 * @return
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
188 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
189 public DocuDirent getFile(String fn, int in, FileClass fc) {
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
190 DocuDirectory dd;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
191 // file number is 1-based, vector index is 0-based
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
192 int n = in - 1;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
193 // first, assume fn is a directory and look in the cache
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
194 dd = map.get(fn);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
195 if (dd == null) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
196 // cache miss
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
197 misses.incrementAndGet();
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
198 /*
287
dd1e681924bf Servlet version 1.22b2
robcast
parents: 282
diff changeset
199 * see if fn is a directory
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
200 */
152
f4a5cfe37469 Servlet version 1.16a1
robcast
parents: 151
diff changeset
201 File f = new File(baseDirNames[0], fn);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
202 if (f.isDirectory()) {
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 287
diff changeset
203 // logger.debug(fn + " is a dir");
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
204 dd = new DocuDirectory(fn, this);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
205 if (dd.isValid()) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
206 // add to the cache
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
207 dd = putDir(dd);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
208 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
209 } else {
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
210 /*
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
211 * maybe it's a file
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
212 */
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
213 // get the parent directory string (like we store it in the
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
214 // cache)
246
aaf6eace011d Servlet version 1.19b4
robcast
parents: 209
diff changeset
215 String d = FileOps.parent(fn);
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
216 // try it in the cache
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 287
diff changeset
217 // logger.debug(fn + " is a file in dir " + d);
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
218 dd = map.get(d);
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
219 if (dd == null) {
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
220 // try to read from disk
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
221 dd = new DocuDirectory(d, this);
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
222 if (dd.isValid()) {
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
223 // add to the cache
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 287
diff changeset
224 // logger.debug(dd + " is valid");
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
225 dd = putDir(dd);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
226 } else {
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
227 // invalid path
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
228 return null;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
229 }
99
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
230 } else {
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
231 // it was not a real cache miss
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
232 misses.decrementAndGet();
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
233 }
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
234 // get the file's index
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
235 n = dd.indexOf(f.getName(), fc);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
236 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
237 } else {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
238 // cache hit
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
239 hits.incrementAndGet();
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
240 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
241 dd.refresh();
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
242 if (dd.isValid()) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
243 try {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
244 return dd.get(n, fc);
187
b3f9a7f646c5 Servlet version 1.18b3 new Raster servlet
robcast
parents: 181
diff changeset
245 } catch (IndexOutOfBoundsException e) {
473
fca40a188a22 modified DocuDirent.compareTo instead of ImageFileset.compareTo
hertzhaft
parents: 472
diff changeset
246 // logger.debug(fn + " not found in directory");
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
247 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
248 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
249 return null;
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
250 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
251
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
252 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
253 * Returns the DocuDirectory indicated by the pathname <code>fn</code>.
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
254 *
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
255 * If <code>fn</code> is a file then its parent directory is returned.
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
256 *
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
257 * @param fn
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
258 * digilib pathname
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
259 * @return
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
260 */
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
261 public DocuDirectory getDirectory(String fn) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
262 DocuDirectory dd;
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
263 // first, assume fn is a directory and look in the cache
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
264 dd = map.get(fn);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
265 if (dd == null) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
266 // cache miss
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
267 misses.incrementAndGet();
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
268 // see if it's a directory
152
f4a5cfe37469 Servlet version 1.16a1
robcast
parents: 151
diff changeset
269 File f = new File(baseDirNames[0], fn);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
270 if (f.isDirectory()) {
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
271 dd = new DocuDirectory(fn, this);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
272 if (dd.isValid()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
273 // add to the cache
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
274 dd = putDir(dd);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
275 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
276 } else {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
277 // maybe it's a file
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
278 if (f.canRead()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
279 // try the parent directory in the cache
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
280 dd = map.get(f.getParent());
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
281 if (dd == null) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
282 // try to read from disk
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
283 dd = new DocuDirectory(f.getParent(), this);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
284 if (dd.isValid()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
285 // add to the cache
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
286 dd = putDir(dd);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
287 } else {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
288 // invalid path
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
289 return null;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
290 }
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
291 } else {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
292 // not a real cache miss then
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
293 misses.decrementAndGet();
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
294 }
99
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
295 } else {
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
296 // it's not even a file :-(
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
297 return null;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
298 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
299 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
300 } else {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
301 // cache hit
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
302 hits.incrementAndGet();
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
303 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
304 dd.refresh();
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
305 if (dd.isValid()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
306 return dd;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
307 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
308 return null;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
309 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
310
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
311 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
312 * @return String[]
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
313 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
314 public String[] getBaseDirNames() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
315 return baseDirNames;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
316 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
317
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
318 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
319 * Sets the baseDirNames.
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
320 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
321 * @param baseDirNames
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
322 * The baseDirNames to set
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
323 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
324 public void setBaseDirNames(String[] baseDirNames) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
325 this.baseDirNames = baseDirNames;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
326 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
327
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
328 /**
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
329 * @return long
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
330 */
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
331 public int getNumFiles() {
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
332 return numImgFiles.get();
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
333 }
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
334
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
335 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
336 * @return long
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
337 */
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
338 public int getHits() {
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
339 return hits.get();
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
340 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
341
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
342 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
343 * @return long
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
344 */
937
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
345 public int getMisses() {
7bcc6765c209 improved runtime statistics
robcast
parents: 903
diff changeset
346 return misses.get();
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
347 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
348
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
349 /**
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
350 * @return
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
351 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
352 public FileClass[] getFileClasses() {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
353 return fileClasses;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
354 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
355
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
356 /**
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
357 * @param fileClasses
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
358 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
359 public void setFileClasses(FileClass[] fileClasses) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
360 this.fileClasses = fileClasses;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
361 }
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
362
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
363 }