Changeset 655 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Cache.java

Timestamp:

08/25/10 20:51:06 (14 years ago)

Author:

vronk

Message:

renamed document_counter to cacheindex_doc in Cache + added its path to .properties. added collection2htmlpage-view.

File:

• MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Cache.java (modified) (15 diffs)

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Cache.java

@@ -23 +23 @@
 import javax.xml.transform.*;
 import javax.xml.transform.sax.*;
-import javax.xml.transform.stream.*;
-import javax.xml.transform.dom.*;
+import javax.xml.transform.stream.*;import javax.xml.transform.dom.*;
 import javax.xml.xpath.*;
 
@@ -52 +51 @@
         private static Cache singleton;
         private String cachepath; 
+        private String cacheindex_path;
         private static Integer cachecounter;
         private static final Integer start_cache = 1;
         
-        private static Document document_counter;
+        private static Document cacheindex_doc;
         
         public Cache () {               
                 cachepath = Admin.getConfig().getProperty("cache.path");
+                cacheindex_path = cachepath + Admin.getConfig().getProperty("cacheindex.file");
                 cachecounter = initCachecounter();
         }
@@ -97 +98 @@
                 
                 //update xml_structure
-                Element e = document_counter.createElement("f");
-                //Attr attr = document_counter.createAttribute("id");
+                Element e = cacheindex_doc.createElement("f");
+                //Attr attr = cacheindex_doc.createAttribute("id");
                 //attr.setValue(c.toString());
                 //e.setNamedItem(attr);
@@ -124 +125 @@
                 DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd:hh-mm-ss");
                 e.setAttribute("date", dateFormat.format(new Date()).toString());
-                document_counter.getFirstChild().appendChild(e);
+                cacheindex_doc.getFirstChild().appendChild(e);
                 
                 // update XML-counter
@@ -132 +133 @@
                 
                 xc = PREFIX + key_array[0] + "_" + c.toString();
+                Admin.notifyUser("CACHE.putInCache.filename:" + xc + ".xml");
                 Admin.writeToFile(cachepath + xc + ".xml",instream);
                 
@@ -139 +141 @@
         
         public InputStream getFromCache(String key_info) {
+                   
+                
+                   File f = new File (formPath(key_info));
                    Admin.notifyUser("CACHE.getFromCache:"+key_info);
-                
-                   File f = new File (formPath(key_info));
-                    
+                   
                     if (f.exists()) { // read from file to InputStream;
+                        Admin.notifyUser("CACHE.getFromCache.fromfile:"+f.getName());
                         InputStream instream;
                                 try {
@@ -156 +160 @@
                         
                     } else { //not cached, my dear 
+                        Admin.notifyUser("CACHE.getFromCache: NOT CACHED");
                         return null;
                     }       
@@ -222 +227 @@
                         expr = xpath.compile(xpath_expr);
                         //expression is evaluated with respect to a certain context node which is doc.
-                Object result = expr.evaluate(document_counter, XPathConstants.NODESET);
+                Object result = expr.evaluate(cacheindex_doc, XPathConstants.NODESET);
                 NodeList list = (NodeList) result;
                 if (list.getLength() > 0) {
@@ -254 +259 @@
                 Integer counter = start_cache;
                 boolean init=false;
-                String fname = cachepath + "cache_counter.xml";
+                String fname = cacheindex_path;
                 File f = new File (fname);
                 
@@ -264 +269 @@
                                 try {
                                         docBuilder = docFactory.newDocumentBuilder();
-                                        document_counter = docBuilder.newDocument();
+                                        cacheindex_doc = docBuilder.newDocument();
                                         // append root tag <index >
-                                        Element root = (Element) document_counter.createElement("index");
+                                        Element root = (Element) cacheindex_doc.createElement("index");
                                         root.setAttribute("idcounter", "1");
-                                        document_counter.appendChild(root);
+                                        cacheindex_doc.appendChild(root);
                                         writeCachecounter(counter);
                                         
@@ -290 +295 @@
                                         docBuilder = docFactory.newDocumentBuilder();               
                                         try {
-                                                        document_counter = docBuilder.parse(fname);
+                                                        cacheindex_doc = docBuilder.parse(fname);
                                         } catch (SAXException e) {
                                                         // TODO Auto-generated catch block
@@ -302 +307 @@
                                 
                          //read counter
-                         counter = new Integer(document_counter.getFirstChild().getAttributes().getNamedItem("idcounter").getNodeValue());
+                         counter = new Integer(cacheindex_doc.getFirstChild().getAttributes().getNamedItem("idcounter").getNodeValue());
                          init = true;
                     }  catch (IOException ex){
@@ -351 +356 @@
             writeCachecounter( cachecounter);
         }
-        public void writeCachecounter (Integer i) {
-                
+        public void writeCachecounter (Integer i) {             
                 
                 // first update <index idcounter>
-                document_counter.getFirstChild().getAttributes().getNamedItem("idcounter").setNodeValue(i.toString());
+                cacheindex_doc.getFirstChild().getAttributes().getNamedItem("idcounter").setNodeValue(i.toString());
                 
                 //Admin.notifyUser("writeCacheCounter:" + i.toString());
@@ -366 +370 @@
                         //initialize StreamResult with File object to save to file
                         StreamResult result = new StreamResult(new StringWriter());
-                        DOMSource source = new DOMSource(document_counter);
+                        DOMSource source = new DOMSource(cacheindex_doc);
                         try {
                                 transformer.transform(source, result);
@@ -379 +383 @@
 
 
-                        File f = new File (cachepath + "counter.xml");
+                        File f = new File (cacheindex_path);
                         FileWriter fw;
                         try {