Menu
▾
▴
[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/vocab MetadataVocab.java,1.20,1.21
|
From: C. R. D. <rya...@us...> - 2003-07-29 00:39:27
|
Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/vocab
In directory sc8-pr-cvs1:/tmp/cvs-serv7591/src/org/dlese/dpc/vocab
Modified Files:
MetadataVocab.java
Log Message:
Added enabled sets and accesioned status to histogram queries to ensure
that totals match search results
Index: MetadataVocab.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/vocab/MetadataVocab.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** MetadataVocab.java 28 Jul 2003 18:18:50 -0000 1.20
--- MetadataVocab.java 29 Jul 2003 00:39:24 -0000 1.21
***************
*** 21,27 ****
import javax.servlet.http.*;
import javax.servlet.jsp.PageContext;
- import org.dlese.dpc.index.*;
import org.dlese.dpc.util.strings.StringUtil;
import org.xml.sax.*;
/*
--- 21,28 ----
import javax.servlet.http.*;
import javax.servlet.jsp.PageContext;
import org.dlese.dpc.util.strings.StringUtil;
import org.xml.sax.*;
+ import org.dlese.dpc.index.*;
+ import org.dlese.dpc.repository.*;
/*
***************
*** 763,791 ****
String subQuery = (String)luceneQuery.get( name + "=" + node.name );
float perc = ( (float)count.intValue() / (float)getHistogramHighestCount( session ) );
- //if ( perc == 0 ) {
- // perc++;
- //}
if ( !isFirst ) {
ret.append( EMPTY_ROW );
}
! String a_href = "";
! try {
! a_href = "<a href='" + LINK_URL + getFieldSystemId( name ) + "=" + node.name + "'>";
! }
! catch ( Exception e ) {
! reportError( e.getMessage() );
! }
! ret.append( "<tr><td background='" + imgPrefix + "images/hist_back.gif' align='right' width='25%'><b><i>" )
.append( "<span class='histogramSubHeader'>" )
- .append( a_href )
.append( node.label )
! .append( "</a></span>" )
! .append( "</i></b></td><td background='" + imgPrefix + "images/hist_ruler.gif' width='78%'> " )
! .append( a_href )
! .append( "<img src='/dds/images/hist_bar.gif' border='0' height='7' width='" )
! .append( String.valueOf( Math.round( perc * LARGEST_BAR ) ) )
! .append( "'></a> <b>" )
! .append( String.valueOf( count ) )
! .append( "</b></td></tr>\n" );
}
else if ( !node.noDisplay ) {
--- 764,797 ----
String subQuery = (String)luceneQuery.get( name + "=" + node.name );
float perc = ( (float)count.intValue() / (float)getHistogramHighestCount( session ) );
if ( !isFirst ) {
ret.append( EMPTY_ROW );
}
!
! /*
! String a_href = "";
! try {
! a_href = "<a href='" + LINK_URL + getFieldSystemId( name ) + "=" + node.name + "'>";
! }
! catch ( Exception e ) {
! reportError( e.getMessage() );
! }
! ret.append( "<tr><td background='images/hist_back.gif' align='right' width='25%'><b><i>" )
! .append( "<span class='histogramSubHeader'>" )
! .append( a_href )
! .append( node.label )
! .append( "</a></span>" )
! .append( "</i></b></td><td background='images/hist_ruler.gif' width='75%'> " )
! .append( a_href )
! .append( "<img src='/dds/images/hist_bar.gif' border='0' height='7' width='" )
! .append( String.valueOf( Math.round( perc * LARGEST_BAR ) ) )
! .append( "'></a> <b>" )
! .append( String.valueOf( count ) )
! .append( "</b></td></tr>\n" );
! */
! ret.append( "<tr><td align='right' width='25%'><b><i>" )
.append( "<span class='histogramSubHeader'>" )
.append( node.label )
! .append( "</span>" )
! .append( "</i></b></td><td> </td></tr>\n" );
}
else if ( !node.noDisplay ) {
***************
*** 802,809 ****
reportError( e.getMessage() );
}
! ret.append( "<tr><td background='" + imgPrefix + "images/hist_back.gif' align='right' width='25%' height='8'>" )
.append( a_href )
.append( node.label )
! .append( "</a></td><td background='" + imgPrefix + "images/hist_ruler.gif' width='75%'> " )
.append( a_href )
.append( "<img src='/dds/images/hist_bar.gif' border='0' height='7' width='" )
--- 808,815 ----
reportError( e.getMessage() );
}
! ret.append( "<tr><td background='images/hist_back.gif' align='right' width='25%' height='8'>" )
.append( a_href )
.append( node.label )
! .append( "</a></td><td background='images/hist_ruler.gif' width='75%'> " )
.append( a_href )
.append( "<img src='/dds/images/hist_bar.gif' border='0' height='7' width='" )
***************
*** 937,941 ****
String name = setTopMetaName( group );
VocabList current = setCurrent( system, group );
! int ret = vocabHistogramHighestCountFromGroup( current, name, browser, 0, histogramTotals, addQuery );
if ( !onlyIfGreaterThanCurrent || ( ret > getHistogramHighestCount( session ) ) ) {
setHistogramHighestCount( session, ret );
--- 943,950 ----
String name = setTopMetaName( group );
VocabList current = setCurrent( system, group );
! RepositoryManager rm =
! (RepositoryManager)page.getServletContext().getAttribute( "repositoryManager" );
! int ret = vocabHistogramHighestCountFromGroup( current, name, browser, 0,
! histogramTotals, addQuery, " AND accessionstatus:accessioned AND " + rm.getEnabledSetsQuery() );
if ( !onlyIfGreaterThanCurrent || ( ret > getHistogramHighestCount( session ) ) ) {
setHistogramHighestCount( session, ret );
***************
*** 952,955 ****
--- 961,965 ----
*@param histogramTotals
*@param addQuery
+ *@param validQuery
*@return
*/
***************
*** 959,963 ****
int countSoFar,
HashMap histogramTotals,
! String addQuery ) {
int ret = 0;
for ( int i = 0; i < list.item.size(); i++ ) {
--- 969,974 ----
int countSoFar,
HashMap histogramTotals,
! String addQuery,
! String validQuery ) {
int ret = 0;
for ( int i = 0; i < list.item.size(); i++ ) {
***************
*** 971,980 ****
reportError( e.getMessage() );
}
! ret = browser.numDocs( addQuery + " +(" + subQuery + ")" );
}
else {
try {
ret = browser.numDocs( addQuery + " +" + getFieldSystemId( name )
! + ":\"" + getFieldValueSystemId( name, node.name ) + "\"" );
}
catch ( Exception e ) {
--- 982,991 ----
reportError( e.getMessage() );
}
! ret = browser.numDocs( addQuery + " +(" + subQuery + ")" + validQuery );
}
else {
try {
ret = browser.numDocs( addQuery + " +" + getFieldSystemId( name )
! + ":\"" + getFieldValueSystemId( name, node.name ) + "\"" + validQuery );
}
catch ( Exception e ) {
***************
*** 990,994 ****
}
if ( node.list.item.size() > 0 ) {
! int newRet = vocabHistogramHighestCountFromGroup( node.list, name, browser, countSoFar, histogramTotals, addQuery );
if ( newRet > ret ) {
countSoFar = ret = newRet;
--- 1001,1005 ----
}
if ( node.list.item.size() > 0 ) {
! int newRet = vocabHistogramHighestCountFromGroup( node.list, name, browser, countSoFar, histogramTotals, addQuery, validQuery );
if ( newRet > ret ) {
countSoFar = ret = newRet;
|