pnever 2004/12/07 02:04:34
Modified:
proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer
Tag: TWS421_BRANCH ContentCheck.java
RepairHandler.java
Log:
Repair tool - more fixes ...
Revision Changes Path
No revision
No revision
1.1.4.3 +10 -8
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/ContentCheck.java
Index: ContentCheck.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/ContentCheck.java,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- ContentCheck.java 6 Dec 2004 11:23:25 -0000 1.1.4.2
+++ ContentCheck.java 7 Dec 2004 10:04:33 -0000 1.1.4.3
@@ -62,6 +62,7 @@
public class ContentCheck extends AbstractCheck implements RepairConstants {
XStoreGroup group;
+ XTaminoClient taminoClient4History;
/**
** Creates a test to match the content length of the document.
@@ -70,9 +71,10 @@
**
** @param taminoClient db session
**/
- protected ContentCheck(XStoreGroup group, XTaminoClient taminoClient)
throws XException {
+ protected ContentCheck(XStoreGroup storeGroup, XTaminoClient
taminoClient, XTaminoClient taminoClient4History) throws XException {
super(taminoClient, MSG_START_CONTENT_INCONSISTENCIES,
MSG_DESCR_CONTENT_INCONSISTENCIES);
- this.group = group;
+ this.group = storeGroup;
+ this.taminoClient4History = taminoClient4History;
}
/**
@@ -138,11 +140,11 @@
versionUri =
versionUri.substring(versionUri.indexOf('>') + 1, versionUri.indexOf("</"));
version = new XUri(versionUri).lastSegment();
versionNumber = new
NodeRevisionNumber(version);
- versionDesc =
taminoClient.getDescriptorsAccessor()
+ versionDesc =
taminoClient4History.getDescriptorsAccessor()
.readDescriptorsByPath(versionUri,
group.getMainStore().useBinding());
String versionContentId =
XDescriptorsUtil.getContentId(versionDesc, versionNumber);
if (versionContentId != null) {
- versionContent =
taminoClient.getContentAccessor().readContent(versionContentId);
+ versionContent =
taminoClient4History.getContentAccessor().readContent(versionContentId);
versionContent = new
XContent(versionContent.getContent(),
versionDesc.getRevisionDescriptor(versionNumber));
versionContent.setContentId(versionContentId);
}
1.1.4.3 +16 -15
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/RepairHandler.java
Index: RepairHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/tools/repairer/RepairHandler.java,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -r1.1.4.2 -r1.1.4.3
--- RepairHandler.java 6 Dec 2004 11:23:26 -0000 1.1.4.2
+++ RepairHandler.java 7 Dec 2004 10:04:33 -0000 1.1.4.3
@@ -330,21 +330,22 @@
/**
* Repair worker method
*/
- private void doRepair(int mode, XStoreGroup logical, OnOpenTaToken
token, boolean checkOnly) throws XException {
- logWriter.println( TC_CONSOLE_ONLY, logical.toString() );
+ private void doRepair(int mode, XStoreGroup storeGroup, OnOpenTaToken
token, boolean checkOnly) throws XException {
+ logWriter.println( TC_CONSOLE_ONLY, storeGroup.toString() );
logWriter.println( TC_CONSOLE_ONLY, "--" );
- XTaminoClient taminoClient =
XTaminoClient.create(logical.getMainStore(), user, pwd);
+ XTaminoClient taminoClient =
XTaminoClient.create(storeGroup.getMainStore(), user, pwd);
+ XTaminoClient taminoClient4History =
XTaminoClient.create(storeGroup.getByType("history"), user, pwd);
// get exclusive access to the store
if( serverIsRunning ) {
- lockStore( logical.getMainStore().getName(), token );
- lockedStores.add( logical.getMainStore() );
+ lockStore( storeGroup.getMainStore().getName(), token );
+ lockedStores.add( storeGroup.getMainStore() );
}
// perform the checks
patches = new ArrayList();
- Iterator checksIt = createChecks(mode, taminoClient,
logical).iterator();
+ Iterator checksIt = createChecks(mode, taminoClient,
taminoClient4History, storeGroup).iterator();
try {
while (checksIt.hasNext()) {
// run the check
@@ -481,7 +482,7 @@
* Get the list of checks to perform.
* This methods combines a list of essential tests in depending of the
test mask.
*/
- private List createChecks(int mode, XTaminoClient taminoClient,
XStoreGroup group) throws XException {
+ private List createChecks(int mode, XTaminoClient taminoClient,
XTaminoClient taminoClient4History, XStoreGroup storeGroup) throws XException {
XNamespace ns;
XStore main;
List checks;
@@ -489,8 +490,8 @@
XUri rootUri;
String rootUuri;
- main = group.getMainStore();
- tmp = group.getMainStore().getScope().toString();
+ main = storeGroup.getMainStore();
+ tmp = storeGroup.getMainStore().getScope().toString();
rootUri = main.getScope();
rootUuri = XUuri.getStoreUuri(main.useBinding(), new XUri(tmp));
checks = new ArrayList(); // required to keep the order of the
checks :-)
@@ -513,8 +514,8 @@
checks.add(new ValidDescriptorsCheck(taminoClient));
// checks.add(new UniqueContentIdCheck(group, taminoClient));
checks.add(new UniqueDescriptorsIdCheck(taminoClient));
- checks.add(new ContentCheck(group, taminoClient));
- checks.add(new UniqueContentIdCheck(group, taminoClient));
+ checks.add(new ContentCheck(storeGroup, taminoClient,
taminoClient4History));
+ checks.add(new UniqueContentIdCheck(storeGroup,
taminoClient));
// checks.add(new NamespaceConsistencyCheck(taminoClient));
// checks.add(new GarbageCheck(main, taminoClient));
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
