annotate servlet/src/digilib/io/DocuDirCache.java @ 759:16a16ca5f651 stream

use concurrent put methods in DocuDirDache. move synchronized to readdir in DocuDirectory.
author robcast
date Tue, 08 Feb 2011 22:49:44 +0100
parents 485b85f6e097
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;
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
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
33 import digilib.io.FileOps.FileClass;
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 */
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
45 ConcurrentMap<String, DocuDirectory> map = new ConcurrentHashMap<String, DocuDirectory>();
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) */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
51 private FileClass[] 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
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
62 /** the root directory element */
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
63 public static Directory ROOT = null;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
64
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
65 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
66 * Constructor with array of base directory names and file classes.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
67 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
68 * @param bd
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
69 * base directory names
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
70 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
71 public DocuDirCache(String[] bd, FileClass[] fcs,
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
72 DigilibConfiguration dlConfig) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
73 baseDirNames = bd;
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
74 this.fileClasses = fcs;
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
75 }
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
76
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
77 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
78 * Constructor with array of base directory names.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
79 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
80 * @param bd
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
81 * base directory names
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
82 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
83 public DocuDirCache(String[] bd) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
84 baseDirNames = bd;
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
85 // default file class is CLASS_IMAGE
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
86 fileClasses = new FileClass[] { FileClass.IMAGE };
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
87 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
88
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
89 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
90 * The number of directories in the cache.
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
91 *
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
92 * @return
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
93 */
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
94 public int size() {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
95 return (map != null) ? map.size() : 0;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
96 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
97
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
98 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
99 * Add a DocuDirectory to the cache.
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
100 * Always returns the correct Object from the cache,
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
101 * either newdir one or another one.
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
102 *
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
103 * @param newdir
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
104 * @return dir
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
105 */
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
106 public DocuDirectory put(DocuDirectory newdir) {
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
107 String s = newdir.getDirName();
750
4f5aaa0de456 removed synchronized from some methods
robcast
parents: 563
diff changeset
108 logger.debug("DocuDirCache.put for "+s+" in "+this);
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
109 DocuDirectory olddir = map.putIfAbsent(s, newdir);
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
110 if (olddir != null) {
197
bb4ed821d06e Servlet version 1.18b6
robcast
parents: 187
diff changeset
111 logger.warn("Duplicate key in DocuDirCache.put -- ignoring!");
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
112 return olddir;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
113 }
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
114 numFiles += newdir.size();
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
115 return newdir;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
116 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
117
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
118 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
119 * Add a directory to the cache and check its parents.
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
120 * Always returns the correct Object from the cache,
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
121 * either newDir one or another one.
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
122 *
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
123 * @param newDir
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
124 * @return dir
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
125 */
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
126 public DocuDirectory putDir(DocuDirectory newDir) {
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
127 DocuDirectory dd = put(newDir);
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
128 if (dd.getParent() == null) {
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
129 // no parent link yet
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
130 String parent = FileOps.parent(newDir.getDirName());
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
131 if (parent != "") {
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
132 // check the parent in the cache
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
133 DocuDirectory pd = map.get(parent);
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
134 if (pd == null) {
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
135 // the parent is unknown
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
136 pd = new DocuDirectory(parent, this);
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
137 pd = putDir(pd);
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
138 }
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
139 newDir.setParent(pd);
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
140 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
141 }
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
142 return dd;
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
143 }
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
144
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
145 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
146 * Get a list with all children of a directory.
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
147 *
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
148 * Returns a List of DocuDirectory's. Returns an empty List if the directory
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
149 * has no children. If recurse is false then only direct children are
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
150 * returned.
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
151 *
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
152 * @param dirname
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
153 * @param recurse
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
154 * find all children and their children.
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
155 * @return
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
156 */
531
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
157 public List<DocuDirectory> getChildren(String dirname, boolean recurse) {
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
158 List<DocuDirectory> l = new LinkedList<DocuDirectory>();
9cedd170b581 * PDF generation works now even with subdirectories
robcast
parents:
diff changeset
159 for (DocuDirectory dd: map.values()) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
160 if (recurse) {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
161 if (dd.getDirName().startsWith(dirname)) {
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
162 l.add(dd);
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
163 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
164 } else {
270
b21915a3fc24 Servlet version 1.21b3
robcast
parents: 259
diff changeset
165 if (FileOps.parent(dd.getDirName()).equals(dirname)) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
166 l.add(dd);
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
167 }
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 return l;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
171 }
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
172
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
173 /**
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
174 * Returns the DocuDirent with the pathname <code>fn</code> and the index
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
175 * <code>in</code> and the class <code>fc</code>.
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
176 *
187
b3f9a7f646c5 Servlet version 1.18b3 new Raster servlet
robcast
parents: 181
diff changeset
177 * If <code>fn</code> is a file then the corresponding DocuDirent is
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
178 * returned and the index is ignored.
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
179 *
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
180 * @param fn
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
181 * digilib pathname
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
182 * @param in
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
183 * file index
246
aaf6eace011d Servlet version 1.19b4
robcast
parents: 209
diff changeset
184 * @param fc
282
87dca7119596 Servlet version 1.22b1
robcast
parents: 270
diff changeset
185 * file class
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
186 * @return
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
187 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
188 public DocuDirent getFile(String fn, int in, FileClass fc) {
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
189 DocuDirectory dd;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
190 // file number is 1-based, vector index is 0-based
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
191 int n = in - 1;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
192 // first, assume fn is a directory and look in the cache
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
193 dd = map.get(fn);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
194 if (dd == null) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
195 // cache miss
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
196 misses++;
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
197 /*
287
dd1e681924bf Servlet version 1.22b2
robcast
parents: 282
diff changeset
198 * see if fn is a directory
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
199 */
152
f4a5cfe37469 Servlet version 1.16a1
robcast
parents: 151
diff changeset
200 File f = new File(baseDirNames[0], fn);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
201 if (f.isDirectory()) {
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 287
diff changeset
202 // logger.debug(fn + " is a dir");
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
203 dd = new DocuDirectory(fn, this);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
204 if (dd.isValid()) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
205 // add to the cache
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
206 dd = putDir(dd);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
207 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
208 } else {
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
209 /*
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
210 * maybe it's a file
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
211 */
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
212 // get the parent directory string (like we store it in the
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
213 // cache)
246
aaf6eace011d Servlet version 1.19b4
robcast
parents: 209
diff changeset
214 String d = FileOps.parent(fn);
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
215 // 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
216 // logger.debug(fn + " is a file in dir " + d);
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
217 dd = map.get(d);
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
218 if (dd == null) {
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
219 // try to read from disk
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
220 dd = new DocuDirectory(d, this);
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
221 if (dd.isValid()) {
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
222 // add to the cache
472
f8ca069517a2 Bugfix for images not found in dir: added sorting for ArrayLists of ImageFilesets
hertzhaft
parents: 287
diff changeset
223 // logger.debug(dd + " is valid");
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
224 dd = putDir(dd);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
225 } else {
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
226 // invalid path
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
227 return null;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
228 }
99
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
229 } else {
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
230 // it was not a real cache miss
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
231 misses--;
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
232 }
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
233 // get the file's index
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
234 n = dd.indexOf(f.getName(), fc);
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
235 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
236 } else {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
237 // cache hit
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
238 hits++;
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
239 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
240 dd.refresh();
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
241 if (dd.isValid()) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
242 try {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
243 return dd.get(n, fc);
187
b3f9a7f646c5 Servlet version 1.18b3 new Raster servlet
robcast
parents: 181
diff changeset
244 } catch (IndexOutOfBoundsException e) {
473
fca40a188a22 modified DocuDirent.compareTo instead of ImageFileset.compareTo
hertzhaft
parents: 472
diff changeset
245 // logger.debug(fn + " not found in directory");
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
246 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
247 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
248 return null;
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
249 }
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
250
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
251 /**
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
252 * Returns the DocuDirectory indicated by the pathname <code>fn</code>.
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
253 *
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
254 * If <code>fn</code> is a file then its parent directory is returned.
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
255 *
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
256 * @param fn
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
257 * digilib pathname
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
258 * @return
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
259 */
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
260 public DocuDirectory getDirectory(String fn) {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
261 DocuDirectory dd;
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
262 // first, assume fn is a directory and look in the cache
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
263 dd = map.get(fn);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
264 if (dd == null) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
265 // cache miss
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
266 misses++;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
267 // see if it's a directory
152
f4a5cfe37469 Servlet version 1.16a1
robcast
parents: 151
diff changeset
268 File f = new File(baseDirNames[0], fn);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
269 if (f.isDirectory()) {
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
270 dd = new DocuDirectory(fn, this);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
271 if (dd.isValid()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
272 // add to the cache
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
273 dd = putDir(dd);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
274 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
275 } else {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
276 // maybe it's a file
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
277 if (f.canRead()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
278 // try the parent directory in the cache
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
279 dd = map.get(f.getParent());
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
280 if (dd == null) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
281 // try to read from disk
151
bc8df0133c04 Servlet version 1.15b1
robcast
parents: 116
diff changeset
282 dd = new DocuDirectory(f.getParent(), this);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
283 if (dd.isValid()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
284 // add to the cache
759
16a16ca5f651 use concurrent put methods in DocuDirDache.
robcast
parents: 758
diff changeset
285 dd = putDir(dd);
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
286 } else {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
287 // invalid path
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
288 return null;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
289 }
91
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
290 } else {
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
291 // not a real cache miss then
a398fc09ba71 New version 1.8b4.
robcast
parents: 86
diff changeset
292 misses--;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
293 }
99
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
294 } else {
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
295 // it's not even a file :-(
226624784fe3 Small bug lead to null pointer exception when directory doesn't exist.
robcast
parents: 91
diff changeset
296 return null;
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
297 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
298 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
299 } else {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
300 // cache hit
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
301 hits++;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
302 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
303 dd.refresh();
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
304 if (dd.isValid()) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
305 return dd;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
306 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
307 return null;
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 String[]
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
312 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
313 public String[] getBaseDirNames() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
314 return baseDirNames;
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 * @return long
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
319 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
320 public long getNumFiles() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
321 return numFiles;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
322 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
323
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
324 /**
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
325 * Sets the baseDirNames.
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
326 *
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
327 * @param baseDirNames
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
328 * The baseDirNames to set
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
329 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
330 public void setBaseDirNames(String[] baseDirNames) {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
331 this.baseDirNames = baseDirNames;
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 getHits() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
338 return hits;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
339 }
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 * @return long
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
343 */
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
344 public long getMisses() {
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
345 return misses;
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
346 }
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
347
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
348 /**
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
349 * @return
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
350 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
351 public FileClass[] getFileClasses() {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
352 return fileClasses;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
353 }
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 * @param fileClasses
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
357 */
563
686086d6e6d6 more refactoring and rearranging
robcast
parents: 545
diff changeset
358 public void setFileClasses(FileClass[] fileClasses) {
159
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
359 this.fileClasses = fileClasses;
e743b853efca servlet version 1.16a4
robcast
parents: 152
diff changeset
360 }
176
67ff8c7fecb9 Servlet version 1.17b2
robcast
parents: 159
diff changeset
361
86
997ba69afb81 New version 1.8b1.
robcast
parents:
diff changeset
362 }