[Bedework-commit] dumprestore r403 - releases/bedework-3.7/src/org/bedework/dumprestore/restore

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-14 15:59:02 -0500 (Mon, 14 Feb 2011)
New Revision: 403

Modified:
   releases/bedework-3.7/src/org/bedework/dumprestore/restore/HibRestore.java
   releases/bedework-3.7/src/org/bedework/dumprestore/restore/IndexerMap.java
   releases/bedework-3.7/src/org/bedework/dumprestore/restore/RestoreGlobals.java
Log:
More changes to debugging: Removal of debug parameter.

Modified: releases/bedework-3.7/src/org/bedework/dumprestore/restore/HibRestore.java
===================================================================
--- releases/bedework-3.7/src/org/bedework/dumprestore/restore/HibRestore.java	2011-02-14 15:21:13 UTC (rev 402)
+++ releases/bedework-3.7/src/org/bedework/dumprestore/restore/HibRestore.java	2011-02-14 20:59:02 UTC (rev 403)
@@ -813,7 +813,7 @@
     }
 
     access = new AccessUtil();
-    access.init(new AccessUtilCb(this), globals.config.getDebug());
+    access.init(new AccessUtilCb(this));
     access.setAuthUser(user);
     access.setSuperUser(true);
 

Modified: releases/bedework-3.7/src/org/bedework/dumprestore/restore/IndexerMap.java
===================================================================
--- releases/bedework-3.7/src/org/bedework/dumprestore/restore/IndexerMap.java	2011-02-14 15:21:13 UTC (rev 402)
+++ releases/bedework-3.7/src/org/bedework/dumprestore/restore/IndexerMap.java	2011-02-14 20:59:02 UTC (rev 403)
@@ -55,17 +55,17 @@
    * @param syspars
    * @param debug
    */
-  public IndexerMap(BwSystem syspars, boolean debug) {
+  public IndexerMap(final BwSystem syspars) {
     super();
     this.syspars = syspars;
-    this.debug = debug;
+    debug = debug;
   }
 
   /**
    * @param key  BwUser
    * @return BwIndexer
    */
-  public BwIndexer get(String key) {
+  public BwIndexer get(final String key) {
     Indexer indexer = map.get(key);
 
     if (indexer != null) {
@@ -79,7 +79,7 @@
     indexer = new Indexer();
 
     try {
-      indexer.idx = BwIndexerFactory.getIndexer(false, key, true, syspars, debug);
+      indexer.idx = BwIndexerFactory.getIndexer(false, key, true, syspars);
       indexer.idx.setBatchSize(batchSize);
     } catch (Throwable t) {
       t.printStackTrace();

Modified: releases/bedework-3.7/src/org/bedework/dumprestore/restore/RestoreGlobals.java
===================================================================
--- releases/bedework-3.7/src/org/bedework/dumprestore/restore/RestoreGlobals.java	2011-02-14 15:21:13 UTC (rev 402)
+++ releases/bedework-3.7/src/org/bedework/dumprestore/restore/RestoreGlobals.java	2011-02-14 20:59:02 UTC (rev 403)
@@ -489,8 +489,7 @@
       return publicIndexer;
     }
 
-    publicIndexer = BwIndexerFactory.getIndexer(true, null, true, syspars,
-                                               /*config.getDebug()*/false);
+    publicIndexer = BwIndexerFactory.getIndexer(true, null, true, syspars);
     try {
       publicIndexer.setBatchSize(50);
       publicIndexer.setCleanLocks(true);
@@ -509,7 +508,7 @@
    */
   public BwIndexer getUserIndexer(final String href) throws CalFacadeException {
     if (userIndexers == null) {
-      userIndexers = new IndexerMap(syspars, /*config.getDebug()*/false);
+      userIndexers = new IndexerMap(syspars);
     }
 
     BwIndexer idx = userIndexers.get(href);