annotate servlet/src/digilib/io/DocuDirCache.java @ 259:beed92ee6022

Servlet version 1.21b1 - directory indexing got faster but less safe (configurable by "safe-dir-index") - mo=rawfile supplies filename - DigilibConfig takes File parameters - some SerialVersionUIDs (suggested by Eclipse)
author robcast
date Mon, 11 Oct 2004 21:23:00 +0200
parents aaf6eace011d
children b21915a3fc24
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;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
26 import java.util.HashMap;
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
27 import java.util.Iterator;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
28 import java.util.LinkedList;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
29 import java.util.List;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
30
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 176
diff changeset
31 import org.apache.log4j.Logger;
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 176
diff changeset
32
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
33 import digilib.servlet.DigilibConfiguration;
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
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 */
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
38 public class DocuDirCache {
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
39
181
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 176
diff changeset
40 /** general logger for this class */
afe7ff98bb71 Servlet version 1.18b1
robcast
parents: 176
diff changeset
41 protected Logger logger = Logger.getLogger(this.getClass());
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
42 /** HashMap of directories */
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
43 protected HashMap map = null;
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
44 /** names of base directories */
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
45 private String[] baseDirNames = null;
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
46 /** array of allowed file classes (image/text) */
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
47 private int[] fileClasses = null;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
48 /** number of files in the whole cache (approximate) */
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
49 private long numFiles = 0;
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
50 /** number of cache hits */
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
51 private long hits = 0;
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
52 /** number of cache misses */
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
53 private long misses = 0;
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
54 /** use safe (but slow) indexing */
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
55 boolean safeDirIndex = false;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
56
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
57 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
58 * Constructor with array of base directory names and file classes.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
59 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
60 * @param bd
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
61 * base directory names
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
62 */
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
63 public DocuDirCache(String[] bd, int[] fileClasses, DigilibConfiguration dlConfig) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
64 baseDirNames = bd;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
65 map = new HashMap();
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
66 this.fileClasses = fileClasses;
259
beed92ee6022 Servlet version 1.21b1
robcast
parents: 246
diff changeset
67 safeDirIndex = dlConfig.getAsBoolean("safe-dir-index");
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
68 }
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
69 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
70 * Constructor with array of base directory names.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
71 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
72 * @param bd
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
73 * base directory names
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
74 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
75 public DocuDirCache(String[] bd) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
76 baseDirNames = bd;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
77 map = new HashMap();
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
78 // default file class is CLASS_IMAGE
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
79 fileClasses = new int[1];
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
80 fileClasses[0] = FileOps.CLASS_IMAGE;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
81 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
82
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
83 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
84 * The number of directories in the cache.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
85 *
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
86 * @return
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
87 */
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
88 public int size() {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
89 return (map != null) ? map.size() : 0;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
90 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
91
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
92 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
93 * Add a DocuDirectory to the cache.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
94 *
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
95 * @param newdir
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
96 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
97 public void put(DocuDirectory newdir) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
98 String s = newdir.getDirName();
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
99 if (map.containsKey(s)) {
197
bb4ed821d06e Servlet version 1.18b6
robcast
parents: 187
diff changeset
100 logger.warn("Duplicate key in DocuDirCache.put -- ignoring!");
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
101 } else {
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
102 map.put(s, newdir);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
103 numFiles += newdir.size();
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
104 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
105 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
106
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
107 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
108 * Add a directory to the cache and check its parents.
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
109 *
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
110 * @param newDir
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
111 */
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
112 public void putDir(DocuDirectory newDir) {
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
113 put(newDir);
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
114 String parent = newDir.getParentDirName();
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
115 if (parent != null) {
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
116 // check the parent in the cache
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
117 DocuDirectory pd = (DocuDirectory) map.get(parent);
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
118 if (pd == null) {
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
119 // the parent is unknown
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
120 pd = new DocuDirectory(parent, this);
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
121 putDir(pd);
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
122 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
123 newDir.setParent(pd);
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
124 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
125 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
126
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
127 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
128 * Get a list with all children of a directory.
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
129 *
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
130 * Returns a List of DocuDirectory's. Returns an empty List if the
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
131 * directory has no children. If recurse is false then only direct children
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
132 * are returned.
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
133 *
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
134 * @param dirname
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
135 * @param recurse
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
136 * find all children and their children.
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
137 * @return
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
138 */
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
139 public List getChildren(String dirname, boolean recurse) {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
140 List l = new LinkedList();
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
141 for (Iterator i = map.keySet().iterator(); i.hasNext();) {
209
f8c82fea551a Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 197
diff changeset
142 String n = (String) i.next();
f8c82fea551a Servlet version 1.18b9 -- cleanup and bugfixes
robcast
parents: 197
diff changeset
143 DocuDirectory dd = (DocuDirectory) map.get(n);
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
144 if (recurse) {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
145 if (dd.getDirName().startsWith(dirname)) {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
146 l.add(dd);
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
147 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
148 } else {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
149 if (dd.getParentDirName().equals(dirname)) {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
150 l.add(dd);
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
151 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
152 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
153 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
154 return l;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
155 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
156
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
157 /**
187
b3f9a7f646c5 Servlet version 1.18b3 new Raster servlet
robcast
parents: 181
diff changeset
158 * Returns the DocuDirent with the pathname <code>fn</code> and the
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
159 * index <code>in</code> and the class <code>fc</code>.
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
160 *
187
b3f9a7f646c5 Servlet version 1.18b3 new Raster servlet
robcast
parents: 181
diff changeset
161 * If <code>fn</code> is a file then the corresponding DocuDirent is
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
162 * returned and the index is ignored.
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
163 *
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
164 * @param fn
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
165 * digilib pathname
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
166 * @param in
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
167 * file index
246
aaf6eace011d Servlet version 1.19b4
robcast
parents: 209
diff changeset
168 * @param fc
aaf6eace011d Servlet version 1.19b4
robcast
parents: 209
diff changeset
169 * file class
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
170 * @return
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
171 */
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
172 public DocuDirent getFile(String fn, int in, int fc) {
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
173 DocuDirectory dd;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
174 // file number is 1-based, vector index is 0-based
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
175 int n = in - 1;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
176 // first, assume fn is a directory and look in the cache
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
177 dd = (DocuDirectory) map.get(fn);
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
178 if (dd == null) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
179 // cache miss
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
180 misses++;
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
181 /*
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
182 * see if it's a directory
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
183 */
152
f4a5cfe37469 Servlet version 1.16a1
robcast
parents: 151
diff changeset
184 File f = new File(baseDirNames[0], fn);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
185 if (f.isDirectory()) {
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
186 dd = new DocuDirectory(fn, this);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
187 if (dd.isValid()) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
188 // add to the cache
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
189 putDir(dd);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
190 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
191 } else {
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
192 /*
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
193 * maybe it's a file
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
194 */
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
195 // get the parent directory string (like we store it in the
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
196 // cache)
246
aaf6eace011d Servlet version 1.19b4
robcast
parents: 209
diff changeset
197 String d = FileOps.parent(fn);
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
198 // try it in the cache
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
199 dd = (DocuDirectory) map.get(d);
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
200 if (dd == null) {
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
201 // try to read from disk
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
202 dd = new DocuDirectory(d, this);
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
203 if (dd.isValid()) {
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
204 // add to the cache
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
205 putDir(dd);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
206 } else {
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
207 // invalid path
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
208 return null;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
209 }
99
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
210 } else {
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
211 // it was not a real cache miss
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
212 misses--;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
213 }
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
214 // get the file's index
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
215 n = dd.indexOf(f.getName(), fc);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
216 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
217 } else {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
218 // cache hit
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
219 hits++;
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
220 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
221 dd.refresh();
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
222 if (dd.isValid()) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
223 try {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
224 return dd.get(n, fc);
187
b3f9a7f646c5 Servlet version 1.18b3 new Raster servlet
robcast
parents: 181
diff changeset
225 } catch (IndexOutOfBoundsException e) {
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
226 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
227 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
228 return null;
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
229 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
230
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
231 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
232 * Returns the DocuDirectory indicated by the pathname <code>fn</code>.
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
233 *
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
234 * If <code>fn</code> is a file then its parent directory is returned.
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
235 *
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
236 * @param fn
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
237 * digilib pathname
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
238 * @return
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
239 */
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
240 public DocuDirectory getDirectory(String fn) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
241 DocuDirectory dd;
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
242 // first, assume fn is a directory and look in the cache
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
243 dd = (DocuDirectory) map.get(fn);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
244 if (dd == null) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
245 // cache miss
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
246 misses++;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
247 // see if it's a directory
152
f4a5cfe37469 Servlet version 1.16a1
robcast
parents: 151
diff changeset
248 File f = new File(baseDirNames[0], fn);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
249 if (f.isDirectory()) {
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
250 dd = new DocuDirectory(fn, this);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
251 if (dd.isValid()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
252 // add to the cache
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
253 putDir(dd);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
254 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
255 } else {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
256 // maybe it's a file
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
257 if (f.canRead()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
258 // try the parent directory in the cache
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
259 dd = (DocuDirectory) map.get(f.getParent());
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
260 if (dd == null) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
261 // try to read from disk
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
262 dd = new DocuDirectory(f.getParent(), this);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
263 if (dd.isValid()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
264 // add to the cache
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
265 putDir(dd);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
266 } else {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
267 // invalid path
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
268 return null;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
269 }
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
270 } else {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
271 // not a real cache miss then
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
272 misses--;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
273 }
99
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
274 } else {
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
275 // it's not even a file :-(
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
276 return null;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
277 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
278 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
279 } else {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
280 // cache hit
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
281 hits++;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
282 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
283 dd.refresh();
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
284 if (dd.isValid()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
285 return dd;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
286 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
287 return null;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
288 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
289
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
290 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
291 * @return String[]
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
292 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
293 public String[] getBaseDirNames() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
294 return baseDirNames;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
295 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
296
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
297 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
298 * @return long
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
299 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
300 public long getNumFiles() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
301 return numFiles;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
302 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
303
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
304 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
305 * Sets the baseDirNames.
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
306 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
307 * @param baseDirNames
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
308 * The baseDirNames to set
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
309 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
310 public void setBaseDirNames(String[] baseDirNames) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
311 this.baseDirNames = baseDirNames;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
312 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
313
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
314 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
315 * @return long
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
316 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
317 public long getHits() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
318 return hits;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
319 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
320
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
321 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
322 * @return long
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
323 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
324 public long getMisses() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
325 return misses;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
326 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
327
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
328 /**
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
329 * @return
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
330 */
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
331 public int[] getFileClasses() {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
332 return fileClasses;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
333 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
334
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
335 /**
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
336 * @param fileClasses
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
337 */
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
338 public void setFileClasses(int[] fileClasses) {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
339 this.fileClasses = fileClasses;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
340 }
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
341
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
342 }