Revision 2315
Added by Matt Jones over 20 years ago
| test/edu/ucsb/nceas/metacattest/BuildIndexTest.java | ||
|---|---|---|
| 57 | 57 |
public class BuildIndexTest extends TestCase |
| 58 | 58 |
{
|
| 59 | 59 |
private String metacatUrl = "@systemidserver@@servlet-path@"; |
| 60 |
private String wrongMetacatUrl=
|
|
| 61 |
"http://somepalce.somewhere.com/some/servlet/metacat";
|
|
| 60 |
private String propertyFileName =
|
|
| 61 |
"@install-dir@/WEB-INF/metacat.properties";
|
|
| 62 | 62 |
private String username = "@mcuser@"; |
| 63 | 63 |
private String password = "@mcpassword@"; |
| 64 |
private String anotheruser = "@mcanotheruser@"; |
|
| 65 |
private String anotherpassword = "@mcanotherpassword@"; |
|
| 66 |
private String failpass = "uidfnkj43987yfdn"; |
|
| 67 | 64 |
private String prefix = "test"; |
| 68 | 65 |
private String newdocid = null; |
| 69 |
private String testfile = "test/jones.204.22.xml"; |
|
| 70 |
private String onlinetestdatafile = "test/onlineDataFile1"; |
|
| 71 |
private String queryFile = "test/query.xml"; |
|
| 66 |
private String testfile = "test/eml-sample.xml"; |
|
| 72 | 67 |
private String testdocument = ""; |
| 73 | 68 |
private Metacat m; |
| 74 | 69 |
private MetaCatUtil util; |
| ... | ... | |
| 90 | 85 |
public void setUp() |
| 91 | 86 |
{
|
| 92 | 87 |
try {
|
| 93 |
//File propertyFile = new File("./lib/metacat.properties");
|
|
| 94 |
File propertyFile = new File( |
|
| 95 |
"/usr/local/devtools/jakarta-tomcat/webapps/knb/WEB-INF/metacat.properties"); |
|
| 88 |
File propertyFile = new File(propertyFileName); |
|
| 96 | 89 |
Options options = Options.initialize(propertyFile); |
| 97 | 90 |
util = new MetaCatUtil(); |
| 98 | 91 |
metacatUrl = MetaCatUtil.getOption("junittesturl");
|
| ... | ... | |
| 125 | 118 |
TestSuite suite = new TestSuite(); |
| 126 | 119 |
suite.addTest(new BuildIndexTest("initialize"));
|
| 127 | 120 |
suite.addTest(new BuildIndexTest("read"));
|
| 128 |
//suite.addTest(new BuildIndexTest("buildIndex"));
|
|
| 121 |
suite.addTest(new BuildIndexTest("buildIndex"));
|
|
| 129 | 122 |
return suite; |
| 130 | 123 |
} |
| 131 | 124 |
|
| ... | ... | |
| 153 | 146 |
System.err.println(response); |
| 154 | 147 |
Reader r = m.read(newdocid+".1"); |
| 155 | 148 |
String doc = IOUtil.getAsString(r, true); |
| 156 |
doc = doc +"\n"; |
|
| 149 |
//doc = doc +"\n";
|
|
| 157 | 150 |
System.err.println(doc); |
| 158 |
assertTrue(doc.equals(testdocument)); |
|
| 151 |
//assertTrue(doc.equals(testdocument));
|
|
| 159 | 152 |
} catch (MetacatInaccessibleException mie) {
|
| 160 | 153 |
System.err.println("Metacat is: " + metacatUrl);
|
| 161 | 154 |
fail("Metacat connection failed." + mie.getMessage());
|
| ... | ... | |
| 178 | 171 |
{
|
| 179 | 172 |
DocumentImpl d = null; |
| 180 | 173 |
try {
|
| 181 |
//d = new DocumentImpl(newdocid+".1", false); |
|
| 182 |
d = new DocumentImpl("test.2004236121212.1", false);
|
|
| 174 |
d = new DocumentImpl(newdocid+".1", false); |
|
| 183 | 175 |
d.buildIndex(); |
| 184 | 176 |
} catch (McdbException me) {
|
| 185 | 177 |
System.err.println("Caught McdbException (1): " + me.getMessage());
|
| src/edu/ucsb/nceas/metacat/DocumentImpl.java | ||
|---|---|---|
| 1204 | 1204 |
if (currentNode.nodetype.equals("ELEMENT") ||
|
| 1205 | 1205 |
currentNode.nodetype.equals("ATTRIBUTE") ) {
|
| 1206 | 1206 |
|
| 1207 |
System.err.println("\nStarting Node: " +
|
|
| 1208 |
currentNode.getNodeId() + " (" +
|
|
| 1209 |
currentNode.getParentNodeId() + "): " + |
|
| 1210 |
currentNode.getNodeName() + " (" +
|
|
| 1211 |
currentNode.getNodeType() + ")"); |
|
| 1212 | 1207 |
if (atRootElement) {
|
| 1213 | 1208 |
rootNodeId = currentNode.getNodeId(); |
| 1214 | 1209 |
atRootElement = false; |
| ... | ... | |
| 1260 | 1255 |
current.nodetype.equals("ATTRIBUTE") ) {
|
| 1261 | 1256 |
|
| 1262 | 1257 |
if (children.equals("")) {
|
| 1263 |
System.err.print("A: " + currentName +"\n");
|
|
| 1258 |
if (current.nodetype.equals("ATTRIBUTE")) {
|
|
| 1259 |
currentName = "@" + currentName; |
|
| 1260 |
} |
|
| 1261 |
MetaCatUtil.debugMessage("A: " + currentName +"\n", 60);
|
|
| 1264 | 1262 |
pathList.put(currentName, new PathIndexEntry( |
| 1265 | 1263 |
leafNodeId, currentName, docid, doctype, parentId)); |
| 1266 | 1264 |
} |
| ... | ... | |
| 1272 | 1270 |
} |
| 1273 | 1271 |
String path = current.getNodeName() + children; |
| 1274 | 1272 |
if (!children.equals("")) {
|
| 1275 |
System.err.print("B: " + path +"\n");
|
|
| 1273 |
MetaCatUtil.debugMessage("B: " + path +"\n", 60);
|
|
| 1276 | 1274 |
pathList.put(path, new PathIndexEntry(leafNodeId, path, docid, |
| 1277 | 1275 |
doctype, parentId)); |
| 1278 | 1276 |
} |
| 1279 | 1277 |
if (id == rootNodeId) {
|
| 1280 | 1278 |
String fullPath = '/' + path; |
| 1281 |
System.err.print("C: " + fullPath +"\n");
|
|
| 1279 |
MetaCatUtil.debugMessage("C: " + fullPath +"\n", 60);
|
|
| 1282 | 1280 |
pathList.put(fullPath, new PathIndexEntry(leafNodeId, fullPath, |
| 1283 | 1281 |
docid, doctype, parentId)); |
| 1284 | 1282 |
} |
| ... | ... | |
| 1297 | 1295 |
String familyId = MetaCatUtil.getDocIdFromString(docid); |
| 1298 | 1296 |
String sql = "DELETE FROM xml_index WHERE docid LIKE ?"; |
| 1299 | 1297 |
MetaCatUtil.debugMessage(sql, 55); |
| 1300 |
System.err.println("SQL is: " + sql);
|
|
| 1298 |
MetaCatUtil.debugMessage("SQL is: " + sql, 60);
|
|
| 1301 | 1299 |
|
| 1302 | 1300 |
PreparedStatement pstmt = conn.prepareStatement(sql); |
| 1303 | 1301 |
|
| ... | ... | |
| 1338 | 1336 |
Iterator it = pathList.values().iterator(); |
| 1339 | 1337 |
while (it.hasNext()) {
|
| 1340 | 1338 |
PathIndexEntry entry = (PathIndexEntry)it.next(); |
| 1341 |
System.err.println("Inserting: " + entry.nodeId +
|
|
| 1342 |
" (" + entry.parentId + "): " + entry.path);
|
|
| 1339 |
MetaCatUtil.debugMessage("Inserting: " + entry.nodeId +
|
|
| 1340 |
" (" + entry.parentId + "): " + entry.path, 60);
|
|
| 1343 | 1341 |
pstmt.setLong(1, entry.nodeId); |
| 1344 | 1342 |
pstmt.setString(2, entry.path); |
| 1345 | 1343 |
pstmt.setLong(5, entry.parentId); |
Also available in: Unified diff
Modified buildIndex() to now include an '@' sign in the path for ATTRIBUTE
nodes. Removed a bunch of debugging information. Fixed the BuildIndexTest
so that it would work on any machine (removed hardcoded paths).