annotate servlet/src/digilib/io/DocuDirCache.java @ 286:07bb7d594477 Root_gen2

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