Revision 4212
Added by daigle over 15 years ago
| DBQuery.java | ||
|---|---|---|
| 92 | 92 |
static {
|
| 93 | 93 |
int qryRsltCacheSize = 0; |
| 94 | 94 |
try {
|
| 95 |
qryRsltCacheSize = Integer.parseInt(PropertyService.getProperty("queryresult_cache_size"));
|
|
| 95 |
qryRsltCacheSize = Integer.parseInt(PropertyService.getProperty("database.queryresultCacheSize"));
|
|
| 96 | 96 |
} catch (PropertyNotFoundException pnfe) {
|
| 97 | 97 |
System.err.println("Could not get QUERYRESULTCACHESIZE property in static block: "
|
| 98 | 98 |
+ pnfe.getMessage()); |
| ... | ... | |
| 234 | 234 |
{
|
| 235 | 235 |
// since the query will be too long to be handled, so we divided the |
| 236 | 236 |
// docids vector into couple vectors. |
| 237 |
int size = (new Integer(PropertyService.getProperty("app_resultsetsize"))).intValue();
|
|
| 237 |
int size = (new Integer(PropertyService.getProperty("database.appResultsetSize"))).intValue();
|
|
| 238 | 238 |
logMetacat.info("The size of select doicds is "+docids.size());
|
| 239 | 239 |
logMetacat.info("The application result size in metacat.properties is "+size);
|
| 240 | 240 |
Vector subset = new Vector(); |
| ... | ... | |
| 347 | 347 |
{
|
| 348 | 348 |
qspec = new QuerySpecification(xmlquery, |
| 349 | 349 |
parserName, |
| 350 |
PropertyService.getProperty("accNumSeparator"));
|
|
| 350 |
PropertyService.getProperty("document.accNumSeparator"));
|
|
| 351 | 351 |
} |
| 352 | 352 |
catch (Exception ee) |
| 353 | 353 |
{
|
| ... | ... | |
| 573 | 573 |
{
|
| 574 | 574 |
// for html page, we put everything into one page |
| 575 | 575 |
offset = |
| 576 |
(new Integer(PropertyService.getProperty("web_resultsetsize"))).intValue();
|
|
| 576 |
(new Integer(PropertyService.getProperty("database.webResultsetSize"))).intValue();
|
|
| 577 | 577 |
} |
| 578 | 578 |
else |
| 579 | 579 |
{
|
| 580 | 580 |
offset = |
| 581 |
(new Integer(PropertyService.getProperty("app_resultsetsize"))).intValue();
|
|
| 581 |
(new Integer(PropertyService.getProperty("database.appResultsetSize"))).intValue();
|
|
| 582 | 582 |
} |
| 583 | 583 |
|
| 584 | 584 |
/* |
| ... | ... | |
| 625 | 625 |
String selectionAndExtendedQuery = null; |
| 626 | 626 |
// we only get cache for public |
| 627 | 627 |
if (user != null && user.equalsIgnoreCase("public")
|
| 628 |
&& pagesize == 0 && PropertyService.getProperty("query_cache_on").equals("true"))
|
|
| 628 |
&& pagesize == 0 && PropertyService.getProperty("database.queryCacheOn").equals("true"))
|
|
| 629 | 629 |
{
|
| 630 | 630 |
selectionAndExtendedQuery = query +qspec.getReturnDocList()+qspec.getReturnFieldList(); |
| 631 | 631 |
String cachedResult = getResultXMLFromCache(selectionAndExtendedQuery); |
| ... | ... | |
| 682 | 682 |
document = new StringBuffer(); |
| 683 | 683 |
|
| 684 | 684 |
String completeDocid = docid |
| 685 |
+ PropertyService.getProperty("accNumSeparator");
|
|
| 685 |
+ PropertyService.getProperty("document.accNumSeparator");
|
|
| 686 | 686 |
completeDocid += rev; |
| 687 | 687 |
document.append("<docid>").append(completeDocid).append("</docid>");
|
| 688 | 688 |
if (docname != null) |
| ... | ... | |
| 780 | 780 |
|
| 781 | 781 |
// now we only cached none-paged query and user is public |
| 782 | 782 |
if (user != null && user.equalsIgnoreCase("public")
|
| 783 |
&& pagesize == NONPAGESIZE && PropertyService.getProperty("query_cache_on").equals("true"))
|
|
| 783 |
&& pagesize == NONPAGESIZE && PropertyService.getProperty("database.queryCacheOn").equals("true"))
|
|
| 784 | 784 |
{
|
| 785 | 785 |
//System.out.println("the string stored into cache is "+ resultsetBuffer.toString());
|
| 786 | 786 |
storeQueryResultIntoCache(selectionAndExtendedQuery, resultsetBuffer.toString()); |
| ... | ... | |
| 807 | 807 |
int usage_count = getXmlReturnfieldsTableId(qspec, dbconn); |
| 808 | 808 |
boolean enterRecords = false; |
| 809 | 809 |
|
| 810 |
// get value of xml_returnfield_count
|
|
| 810 |
// get value of database.xmlReturnfieldCount
|
|
| 811 | 811 |
int count = (new Integer(PropertyService |
| 812 |
.getProperty("xml_returnfield_count")))
|
|
| 812 |
.getProperty("database.xmlReturnfieldCount")))
|
|
| 813 | 813 |
.intValue(); |
| 814 | 814 |
|
| 815 | 815 |
// set enterRecords to true if usage_count is more than the offset |
| ... | ... | |
| 877 | 877 |
String element = null; |
| 878 | 878 |
String query = null; |
| 879 | 879 |
int offset = (new Integer(PropertyService |
| 880 |
.getProperty("queryresult_string_length")))
|
|
| 880 |
.getProperty("database.queryresultStringLength")))
|
|
| 881 | 881 |
.intValue(); |
| 882 | 882 |
while (keys.hasNext()) |
| 883 | 883 |
{
|
| ... | ... | |
| 1996 | 1996 |
} |
| 1997 | 1997 |
|
| 1998 | 1998 |
String docidPlusVersion = ((String) docIdList.elementAt(i)) |
| 1999 |
+ PropertyService.getProperty("accNumSeparator") + rev;
|
|
| 1999 |
+ PropertyService.getProperty("document.accNumSeparator") + rev;
|
|
| 2000 | 2000 |
|
| 2001 | 2001 |
//create new documentImpl object |
| 2002 | 2002 |
DocumentImpl documentImplObject = new DocumentImpl( |
| ... | ... | |
| 2273 | 2273 |
version = currentVersion; |
| 2274 | 2274 |
//get package zip entry name |
| 2275 | 2275 |
//it should be docId.revsion.package |
| 2276 |
rootName = packageId + PropertyService.getProperty("accNumSeparator")
|
|
| 2277 |
+ version + PropertyService.getProperty("accNumSeparator")
|
|
| 2276 |
rootName = packageId + PropertyService.getProperty("document.accNumSeparator")
|
|
| 2277 |
+ version + PropertyService.getProperty("document.accNumSeparator")
|
|
| 2278 | 2278 |
+ "package"; |
| 2279 | 2279 |
//get the whole id list for data packadge |
| 2280 | 2280 |
docIdList = getCurrentDocidListForDataPackage(packageId); |
| ... | ... | |
| 2290 | 2290 |
{
|
| 2291 | 2291 |
|
| 2292 | 2292 |
rootName = docIdString |
| 2293 |
+ PropertyService.getProperty("accNumSeparator") + "package";
|
|
| 2293 |
+ PropertyService.getProperty("document.accNumSeparator") + "package";
|
|
| 2294 | 2294 |
//get the whole id list for data packadge |
| 2295 | 2295 |
docIdList = getOldVersionDocidListForDataPackage(docIdString); |
| 2296 | 2296 |
|
| ... | ... | |
| 2338 | 2338 |
// Add String object to htmlDocumentImplList |
| 2339 | 2339 |
String elementInHtmlList = remoteDoc |
| 2340 | 2340 |
.getDocIdWithoutRevsion() |
| 2341 |
+ PropertyService.getProperty("accNumSeparator")
|
|
| 2341 |
+ PropertyService.getProperty("document.accNumSeparator")
|
|
| 2342 | 2342 |
+ remoteDoc.getRevision(); |
| 2343 | 2343 |
htmlDocumentImplList.add(elementInHtmlList); |
| 2344 | 2344 |
}//if |
Also available in: Unified diff
Continue to qualify property names