Changeset 7522

Timestamp:

2004-06-01T17:27:14+12:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed the metadata cache so that it doesn't ignore namespaces -- a certain person had broken this and left a "teh" to give away who it was...

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MetadataXMLFileManager.java (modified) (4 diffs)

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

@@ -218 +218 @@
     }
 
-    /*
-    // returns metadata file from cache or creates a new one
-    public MetadataXMLFile getDummyDocument(File file) {
-    ///ystem.err.println("Get the MetadataXMLFile for " + file.getAbsolutePath());
-    MetadataXMLFile metadata_xml = null;
-    // Determine the name of the target files metadata.xml file.
-    File metadata_file = null;
-    if(file.isFile()) {
-        metadata_file = new File(file.getParentFile(), StaticStrings.METADATA_XML);
-    }
-    else {
-        metadata_file = new File(file, StaticStrings.METADATA_XML);
-    }
-    // Then try to retrieve it from cache. First we consider the case of a cache hit.
-    if(containsKey(metadata_file)) {
-        metadata_xml = (MetadataXMLFile) get(metadata_file);
-    }
-    else {
-        metadata_xml = new MetadataXMLFile();
-        put(metadata_file, metadata_xml);
-    }
-    return metadata_xml;
-    }
-    */
-
-    /*
-    public synchronized void dummyGetMetadata(File file) {
-    String filename = null;
-    if(file.isFile()) {
-        filename = file.getName();
-        file = file.getParentFile();
-    }
-    MetadataXMLFile 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. */
@@ -370 +335 @@
      */
     public synchronized void metadataChanged(MSMEvent event) {
+    System.err.println("In MetadataXMLFileManager::metadataChanged(" + event + ")...");
     File file = event.getFile();
     if(file == null) {
@@ -396 +362 @@
         // File level
         if(file.isFile()) {
+            System.err.println("Calling metadata_xml.addMetadata(" + new_metadata + ")...");
             metadata_xml.addMetadata(file.getName(), new_metadata, event.getAction() == MetaEditPrompt.ACCUMULATE);
         }
@@ -511 +478 @@
     }
 
-    private Metadata checkCache(Metadata metadata) {
-    if(metadata != null) {
-        //if(metadata_cache.contains(metadata.getElement(), metadata.getValueNode())) {
-        //  metadata = (Metadata) metadata_cache.get(metadata.getElement(), metadata.getValueNode());
-        //  System.err.println("cache contains teh value");
-        // }
-        // the element name was used as the key
-        if(metadata_cache.contains(metadata.getElement().getElement().getAttribute("name"), metadata.getValue())) {
-        metadata = (Metadata) metadata_cache.get(metadata.getElement().getElement().getAttribute("name"), metadata.getValue());
-        }
-    }
+
+    private Metadata checkCache(Metadata metadata)
+    {
+    Gatherer.println("Checking cache for " + metadata + "...");
+
+    if (metadata == null) {
+        return null;
+    }
+
+    // Check if the metadata cache already contains this (element, value) pair
+    String element_name = metadata.getElement().toString();
+    if (metadata_cache.contains(element_name, metadata.getValue())) {
+        // If so, return the cached metadata value
+        Gatherer.println("In cache!");
+        return (Metadata) metadata_cache.get(element_name, metadata.getValue());
+    }
+
+    // Not cached, so return the original Metadata object
     return metadata;
     }
 
-    /** 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 {
-    private boolean complete = false;
-    private boolean dummy_load = false;
-
-    GDMLoader(boolean dummy_load) {
-        super("blarg");
-        this.dummy_load = dummy_load;
-    }
-
-
-    public void run() {
-        // Can't open a collections metadata when the collection isn't open!
-        while(!Gatherer.c_man.ready()) {
-        try {
-            wait(100);
-        }
-        catch(Exception error) {
-        }
-        }
-        // Now for each non-file directory in the tree, ask it to load its metadata
-        ArrayList remaining = new ArrayList();
-        remaining.add((FileNode)Gatherer.c_man.getRecordSet().getRoot());
-        int remaining_size = 0;
-        while((remaining_size = remaining.size()) > 0) {
-        FileNode record = (FileNode) remaining.remove(remaining_size - 1);
-        if(!record.isLeaf()) {
-            ///atherer.println("Retrieving metadata.xml for " + record);
-            if (this.dummy_load) {
-            dummyGetMetadata(record.getFile());
-            } else {
-            getMetadata(record.getFile());
-            }
-            for(int i = 0; i < record.getChildCount(); i++) {
-            remaining.add(record.getChildAt(i));
-            }
-
-            ///atherer.println("Retrieving metadata.xml for " + record);
-            getMetadata(record.getFile());
-
-            record.unmap();
-        }
-        record = null;
-        }
-        remaining = null;
-        complete = true;
-    }
-    public void waitUntilComplete() {
-        try {
-        while(!complete) {
-            sleep(100); // 1 second hopefully.
-        }
-        }
-        catch(Exception error) {
-        Gatherer.printStackTrace(error);
-        }
-    }
-    }
-    */
 
     protected boolean removeEldestEntry(Map.Entry eldest) {