Changeset 29224 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSDocumentModel.java

Timestamp:

2014-08-21T12:19:21+12:00 (10 years ago)

Author:

kjdon

Message:

commenting out the doc xml cache. When doing doc editing through a collection, metadata changes are currently handled by metadata-server.pl. This edits files directly, not through DocumentMaker using this class. Therefore the doc xml cache gets out of date, and you lose metadata changes if you then edit the text

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSDocumentModel.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSDocumentModel.java

@@ -103 +103 @@
     protected String _siteHome;
     protected MessageRouter _router;
-    protected HashMap<String, Document> _docCache = new HashMap<String, Document>();
+
+  // When we are doing document editing through browser, metadata changes are currently handled by metadata_server.pl. This edits files directly. If I then come to edit text via this class, the doc xml gets read from the cache and my external changes are lost. I am disabling it for now...
+  //protected HashMap<String, Document> _docCache = new HashMap<String, Document>();
 
     public GSDocumentModel(String siteHome, MessageRouter router)
@@ -695 +697 @@
             docXML = db.parse(docFile);
 
-            _docCache.put(oid + "__" + collection, docXML);
+            //_docCache.put(oid + "__" + collection, docXML);
         }
         catch (Exception ex)
@@ -1910 +1912 @@
 
         Document docXML = null;
-        if ((docXML = _docCache.get(oid + "__" + collection)) == null)
-        {
+        //if ((docXML = _docCache.get(oid + "__" + collection)) == null)
+        //  {
             String filePath = archiveGetDocumentFilePath(oid, collection, userContext);
             File docFile = new File(filePath);
@@ -1926 +1928 @@
                 docXML = db.parse(docFile);
 
-                _docCache.put(oid + "__" + collection, docXML);
+                //_docCache.put(oid + "__" + collection, docXML);
             }
             catch (Exception ex)
@@ -1932 +1934 @@
                 return null;
             }
-        }
+            //  }
         return docXML;
     }