From: Jonathan O. <os...@us...> - 2007-06-30 00:20:05
|
Update of /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/dcs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv2156/dcs Modified Files: DcsDataDocReader.java DcsDataFileIndexingPlugin.java DcsDataRecord.java DcsSetInfo.java Log Message: added "dcsIsFinalStatus" to DcsSetInfo and dcsFileIndexingPlugin to support display of records that have final status but are invalid Index: DcsDataRecord.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/dcs/DcsDataRecord.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** DcsDataRecord.java 26 Jun 2007 21:44:34 -0000 1.30 --- DcsDataRecord.java 30 Jun 2007 00:20:00 -0000 1.31 *************** *** 119,125 **** public boolean isFinalStatus () { ! prtln ("isFinalStatus()"); ! prtln ("\t record status: " + getStatus()); ! prtln ("\t coll final status: " + collectionConfig.getFinalStatusValue()); return getStatus().toLowerCase().equals(collectionConfig.getFinalStatusValue().toLowerCase()); } --- 119,125 ---- public boolean isFinalStatus () { ! // prtln ("isFinalStatus()"); ! // prtln ("\t record status: " + getStatus()); ! // prtln ("\t coll final status: " + collectionConfig.getFinalStatusValue()); return getStatus().toLowerCase().equals(collectionConfig.getFinalStatusValue().toLowerCase()); } Index: DcsSetInfo.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/dcs/DcsSetInfo.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DcsSetInfo.java 26 Jun 2007 21:44:34 -0000 1.7 --- DcsSetInfo.java 30 Jun 2007 00:20:00 -0000 1.8 *************** *** 18,21 **** --- 18,22 ---- package org.dlese.dpc.schemedit.dcs; + import org.dlese.dpc.schemedit.config.StatusFlag; import org.dlese.dpc.repository.*; import java.util.*; *************** *** 27,35 **** */ public class DcsSetInfo extends SetInfo { ! int numDone = -1, numWorking = -1, numValid = -1, numNotValid = -1, numSyncErrors = -1; static String FIELD_NS = DcsDataFileIndexingPlugin.FIELD_NS; String exampleId = null; String idPrefix = null; String authority = null; long uniqueID = 0; --- 28,38 ---- */ public class DcsSetInfo extends SetInfo { ! int numDone = -1, numWorking = -1, numValid = -1, numNotValid = -1, ! numSyncErrors = -1, numFinalAndNotValid = -1; static String FIELD_NS = DcsDataFileIndexingPlugin.FIELD_NS; String exampleId = null; String idPrefix = null; String authority = null; + StatusFlag finalStatusFlag = null; long uniqueID = 0; *************** *** 100,103 **** --- 103,110 ---- } + public int getNumFinalAndNotValid () { + return numFinalAndNotValid; + } + /** * Gets the numWorking attribute of the DcsSetInfo object *************** *** 125,128 **** --- 132,143 ---- } + public StatusFlag getFinalStatusFlag () { + return finalStatusFlag; + } + + public void setFinalStatusFlag (StatusFlag flag) { + finalStatusFlag = flag; + } + public String getExampleId () { return exampleId; *************** *** 134,138 **** /** ! * Sets the setInfoData attribute of the DcsSetInfo object * *@param rm The new setInfoData value --- 149,153 ---- /** ! * Adds DcsSetInfo properties to those of repository.SetInfo for this DcsSetInfo instance. * *@param rm The new setInfoData value *************** *** 145,148 **** --- 160,165 ---- numValid = rm.getIndex().getNumDocs("collection:0" + getSetSpec() + " AND " + FIELD_NS + "isValid:true"); numNotValid = rm.getIndex().getNumDocs("collection:0" + getSetSpec() + " NOT " + FIELD_NS + "isValid:true"); + numFinalAndNotValid = rm.getIndex().getNumDocs("collection:0" + getSetSpec() + + " NOT " + FIELD_NS + "isValid:true" + " AND " + FIELD_NS + "isFinalStatus:true"); this.numSyncErrors = rm.getIndex().getNumDocs("collection:0" + getSetSpec() + " AND " + FIELD_NS + "hasSyncError:true"); } Index: DcsDataDocReader.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/dcs/DcsDataDocReader.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DcsDataDocReader.java 26 Jun 2007 21:44:34 -0000 1.7 --- DcsDataDocReader.java 30 Jun 2007 00:20:00 -0000 1.8 *************** *** 130,134 **** return doc.get(DcsDataFileIndexingPlugin.FIELD_NS + "isValid"); } ! /** --- 130,137 ---- return doc.get(DcsDataFileIndexingPlugin.FIELD_NS + "isValid"); } ! ! public String getIsFinalStatus() { ! return doc.get(DcsDataFileIndexingPlugin.FIELD_NS + "isFinalStatus"); ! } /** Index: DcsDataFileIndexingPlugin.java =================================================================== RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/dcs/DcsDataFileIndexingPlugin.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DcsDataFileIndexingPlugin.java 26 Jun 2007 21:44:34 -0000 1.11 --- DcsDataFileIndexingPlugin.java 30 Jun 2007 00:20:00 -0000 1.12 *************** *** 187,190 **** --- 187,193 ---- newDoc.add(Field.Keyword(FIELD_NS + "status", dcsDataRecord.getStatus())); + + String isFinalStatus = (dcsDataRecord.isFinalStatus() ? "true" : "false"); + newDoc.add(Field.Keyword(FIELD_NS + "isFinalStatus", isFinalStatus)); newDoc.add(Field.Text(FIELD_NS + "statusNote", dcsDataRecord.getStatusNote())); |