Changeset 6036

Timestamp:

2003-11-28T17:45:01+13:00 (20 years ago)

Author:

jmt12

Message:

Removed the dummy code, and the GDMLoader, as legacy stuff is now handled in its own class

File:

• trunk/gli/src/org/greenstone/gatherer/msm/GDMManager.java (modified) (10 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/GDMManager.java

@@ -50 +50 @@
 import org.greenstone.gatherer.msm.MSMListener;
 import org.greenstone.gatherer.util.HashMap3D;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
@@ -64 +65 @@
     private TreeNode root = null;
     /** The threaded object responsible for loading all of the existing metadata.xml files prior to any save action. This is necessary so that hierarchy indexes within the metadata.xml files stay fresh. */
-    private GDMLoader gdm_loader = null;
+    //private GDMLoader gdm_loader = null;
     /** The maximum number of GDMDocuments to load at any one time */
     static final private int MAX_DOCUMENTS = 25;
-    static final private String METADATA_XML = "metadata.xml";
     /** Constructor. */
     public GDMManager() {
-    this(false);
-    }
-
-    public GDMManager(boolean dummy_load) {
     super();
     this.metadata_cache = new HashMap3D(Gatherer.c_man.getCollection().msm.getSize());
     // Connect
     Gatherer.c_man.getCollection().msm.addMSMListener(this);
-    // Now create and start the synchronous GDM loader.
-    gdm_loader = new GDMLoader(dummy_load);
-    gdm_loader.start();
-    ///atherer.println("New GDMManager created.");
     }
 
@@ -136 +128 @@
     File metadata_file = null;
     if(file.isFile()) {
-        metadata_file = new File(file.getParentFile(), METADATA_XML);
+        metadata_file = new File(file.getParentFile(), StaticStrings.METADATA_XML);
     }
     else {
-        metadata_file = new File(file, METADATA_XML);
+        metadata_file = new File(file, StaticStrings.METADATA_XML);
     }
     // Then try to retrieve it from cache. First we consider the case of a cache hit.
@@ -163 +155 @@
     }
 
+    /*
     // returns metadata file from cache or creates a new one
     public GDMDocument getDummyDocument(File file) {
@@ -170 +163 @@
     File metadata_file = null;
     if(file.isFile()) {
-        metadata_file = new File(file.getParentFile(), METADATA_XML);
+        metadata_file = new File(file.getParentFile(), StaticStrings.METADATA_XML);
     }
     else {
-        metadata_file = new File(file, METADATA_XML);
+        metadata_file = new File(file, StaticStrings.METADATA_XML);
     }
     // Then try to retrieve it from cache. First we consider the case of a cache hit.
@@ -185 +178 @@
     return metadata_xml;
     }
-
+    */
+
+    /*
     public synchronized void dummyGetMetadata(File file) {
     String filename = null;
@@ -193 +188 @@
     }
     GDMDocument document = getDummyDocument(file);
-
-
-    }
+    }
+    */
+
     /** Recover the metadata associated with a particular file. Note that this call is synchronized, so that all of the data holders don't need to be. */
     public synchronized ArrayList getMetadata(File file) {
@@ -430 +425 @@
 
     public void waitUntilComplete() {
-        if(gdm_loader != null) {
-        gdm_loader.waitUntilComplete();
-        }
+    //if(gdm_loader != null) {
+    //  gdm_loader.waitUntilComplete();
+    //}
     }
 
@@ -446 +441 @@
 
     /** A separately threaded class to load all of the current metadata.xml files. Note that files can still be loaded on demand if they're not already in the cache. Also provides the functionality to block any other thread until the loading is complete, such as is necessary when moving values about in the value tree hierarchy. */
+    /*
     private class GDMLoader
     extends Thread {
@@ -504 +500 @@
     }
     }
-
-    protected boolean removeEldestEntry(Map.Entry eldest) {
+    */
+
+    protected boolean removeEldestEntry(Map.Entry eldest) {
         if(size() > MAX_DOCUMENTS) {
-            // Save the oldest document before its dumped
-            File file = (File) eldest.getKey();
-            ///ystem.err.println("Dumping oldest Document: " + file.getAbsolutePath());
-            GDMDocument document = (GDMDocument) eldest.getValue();
-            save(file, document);
-            // And then dump it
-            return true;
-        }
-        else {
-            return false;
-        }
-     }
+        // Save the oldest document before its dumped
+        File file = (File) eldest.getKey();
+        ///ystem.err.println("Dumping oldest Document: " + file.getAbsolutePath());
+        GDMDocument document = (GDMDocument) eldest.getValue();
+        save(file, document);
+        // And then dump it
+        return true;
+    }
+    else {
+        return false;
+    }
+    }
 }