Changeset 1540 for MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/internal/Cache.java

Timestamp:

09/19/11 10:39:55 (13 years ago)

Author:

gaba

Message:

Utils.java in place of Helpers and Admin
Diagnostics changes in GenericAction?
code arrangement, comments

File:

• MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/internal/Cache.java (modified) (20 diffs)

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/internal/Cache.java

@@ -35 +35 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -50 +51 @@
  * mapping the request parameters to the indexed files.</p>
  * 
- * This is an internal object, direct user access to cache-data via interface is only possible via <code>AdminAction</code>
+ * This is an internal object, direct user access to cache-data via interface is only possible via <code>...Action</code>
  * @author master
  *
@@ -56 +57 @@
 
 public class Cache {
+        
+        private static Logger log = Logger.getLogger("Cache");
+        
         public static String PREFIX = "xc_";
         
@@ -72 +76 @@
         
         public Cache () {               
-                cachepath = Admin.getConfig().getProperty("cache.path");
-                cacheindex_path = cachepath + Admin.getConfig().getProperty("cacheindex.file");
+                cachepath = Utils.getConfig().getProperty("cache.path");
+                cacheindex_path = cachepath + Utils.getConfig().getProperty("cacheindex.file");
                 cachecounter = initCachecounter();
                 
@@ -125 +129 @@
         public String putInCache(String key_info, InputStream instream) {
 
-                Admin.notifyUser("CACHE.putInCache:"+key_info);
+                log.debug("CACHE.putInCache:"+key_info);
                 Integer c = getCounter();
                 String xc;
                 
-                
                 //update xml_structure
                 Element e = cacheindex_doc.createElement("f");
-                //Attr attr = cacheindex_doc.createAttribute("id");
-                //attr.setValue(c.toString());
-                //e.setNamedItem(attr);
                 e.setAttribute("id", c.toString());
                 String[] key_array = key_info.split("//-");
@@ -197 +197 @@
                 
                 // update XML-counter
-            //Admin.writeToFile(formPath(id + xc),instream);
-                
                 updateCachecounter();
                 
                 xc = PREFIX + key_array[0] + "_" + c.toString();
-                Admin.notifyUser("CACHE.putInCache.filename:" + xc + ".xml");
-                Admin.writeToFile(cachepath + xc + ".xml",instream);
+                log.debug("CACHE.putInCache.filename:" + xc + ".xml");
+                Utils.write2File(cachepath + xc + ".xml",instream);
                 
             return xc;
@@ -213 +211 @@
                 
                    File f = new File (formPath(key_info));
-                   //Admin.notifyUser("CACHE.getFromCache:"+key_info);
-                   
                    
                     if (f.exists()) { // read from file to InputStream;
-                        Admin.notifyUser("CACHE.getFromCache.fromfile:"+f.getName() + "[#" + key_info + "]");
+                        log.debug("CACHE.getFromCache.fromfile:"+f.getName() + "[#" + key_info + "]");
                         InputStream instream;
                                 try {
@@ -224 +220 @@
                                         return instream;
                                 } catch (FileNotFoundException e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
+                                        Utils.errorMessage(e);
                                         return null;
                                 }
                         
                     } else { //not cached, my dear 
-                        Admin.notifyUser("CACHE.getFromCache: NOT CACHED" + "[#" + key_info + "]");
+                        log.debug("CACHE.getFromCache: NOT CACHED" + "[#" + key_info + "]");
                         return null;
                     }       
@@ -245 +240 @@
                 query = new Query("", str,"recordset","");
                 if (query.isStatus(Query.PARSEERROR)) {
-                        Admin.notifyUser("Cache.transformQuery.PARSEERROR:" + query.getMsg());
+                        log.debug("Cache.transformQuery.PARSEERROR:" + query.getMsg());
                         // pass this bad news to the client
-                        //setUserMsg(query.getMsg());
                         transformed = "";
                 } else {
                         transformed =  Query.getSimpleQueryString(str);
                         transformed = StringEscapeUtils.escapeXml(transformed);
-                        //Admin.notifyUser("CACHE.transformQuery:"+transformed);
+                        //log.debug("CACHE.transformQuery:"+transformed);
                 }
                 return transformed;
@@ -268 +262 @@
                 
                 if(key_array.length > 1){
-                //      Admin.notifyUser("formPATH- querystring:" + key_array[1]);
+                //      log.debug("formPATH- querystring:" + key_array[1]);
                         if (key_array[0].equals("recordset")){
                                 query_str = this.transformQuery(key_array[1]);  
-                        //      Admin.notifyUser("formPATH- querystring-transformed:" + query_str);
+                        //      log.debug("formPATH- querystring-transformed:" + query_str);
                         }
                         else {
@@ -319 +313 @@
                 }
                 
-                //Admin.notifyUser("formPath:xpath:"+xpath_expr);
+                //log.debug("formPath:xpath:"+xpath_expr);
                 //creating an XPathFactory:
         XPathFactory factory = XPathFactory.newInstance();
@@ -335 +329 @@
                         path = cachepath + PREFIX + key_array[0] + "_"+id + ".xml";
                 }  else if (list.getLength() > 1){
-                        Admin.notifyUser("formPath ERROR:!!!:multiple paths:"+key_info);
+                        log.debug("formPath ERROR:!!!:multiple paths:"+key_info);
                         
                 }
                 
                 } catch (XPathExpressionException e) {
-                        // TODO Auto-generated catch block
-                        Admin.notifyUser("ERROR Cache.formPath: "+xpath_expr);
+                        log.debug("ERROR Cache.formPath: "+xpath_expr);
+                        log.error(Utils.errorMessage(e));
                 }
                 
@@ -353 +347 @@
         
         /**
-         * read counter-integer from file in cache
+         * Read counter-integer from file in cache
          * or start that file
          * @return The current maximum cache counter
@@ -360 +354 @@
                 
                 Integer counter = start_cache;
-                boolean init=false;
                 String fname = cacheindex_path;
                 File f = new File (fname);
                 
-                //Admin.notifyUser("initCacheCounter");
                 if (!f.exists()) {
                                 // create new  counter document
@@ -378 +370 @@
                                         writeCachecounter(counter);
                                         
-                                        //Admin.notifyUser("new document");
                                 } catch (ParserConfigurationException e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
+                                        log.error(Utils.errorMessage(e));
                                 }
-                                
-                        //} catch (IOException e2) {
-                        //      Admin.notifyUser("ERROR creating cache counter");
-                        //      e2.printStackTrace();
-                        //}
             }
                 else {
@@ -399 +384 @@
                                                         cacheindex_doc = docBuilder.parse(fname);
                                         } catch (SAXException e) {
-                                                        // TODO Auto-generated catch block
-                                                        
-                                                        e.printStackTrace();
+                                                log.error(Utils.errorMessage(e));
                                         }
                                 } catch (ParserConfigurationException e) {
-                                                // TODO Auto-generated catch block
-                                                e.printStackTrace();
+                                        log.error(Utils.errorMessage(e));
                                 }
                                 
                          //read counter
                          counter = new Integer(cacheindex_doc.getFirstChild().getAttributes().getNamedItem("idcounter").getNodeValue());
-                         init = true;
-                    }  catch (IOException ex){
-                        //Admin.notifyUser("initCacheCounter:" + ex.toString());
-                        ex.printStackTrace();
+                    }  catch (IOException e){
+                        log.error(Utils.errorMessage(e));
                     }
                 }
                 
             return counter;
-            /*
-              //use buffering, reading one line at a time
-              //FileReader always assumes default encoding is OK!
-                BufferedReader input =  new BufferedReader(new FileReader(f));
-                        try {
-                                String line = null; //not declared within while loop
-                        /*
-                        * readLine is a bit quirky :
-                        * it returns the content of a line MINUS the newline.
-                        * it returns null only for the END of the stream.
-                        * it returns an empty String if two newlines appear in a row.
-                        *
-                        try {
-                                        if (( line = input.readLine()) != null){
-                                                try {
-                                                        counter = new Integer(line);
-                                                } catch (NumberFormatException e) {
-                                                // if not a number, write a number
-                                                        init=true;      
-                                                }  
-                                        } else {
-                                                init=true;
-                                        }
-                                } catch (IOException e) {
-                                        init=true;
-                                }
-                        
-                        if (init) {                                                     
-                            writeCachecounter( start_cache);                                    
-                        }
-                        
-                } finally {
-                input.close();
-             }   
-             */         
         }
 
         public void updateCachecounter () {
-                //Admin.notifyUser("CACHEcounter:" + cachecounter);
             writeCachecounter( cachecounter);
         }
@@ -464 +408 @@
                 cacheindex_doc.getFirstChild().getAttributes().getNamedItem("idcounter").setNodeValue(i.toString());
                 
-                //Admin.notifyUser("writeCacheCounter:" + i.toString());
                 // write xml
                 Transformer transformer;
@@ -476 +419 @@
                         try {
                                 transformer.transform(source, result);
-                        } catch (TransformerException e1) {
-                                // TODO Auto-generated catch block
-                                e1.printStackTrace();
+                        } catch (TransformerException e) {
+                                log.error(Utils.errorMessage(e));
                         }
 
                         String xmlString = result.getWriter().toString();
-                        //Admin.notifyUser("writeCacheCounter:" + xmlString);
-                        //Admin.writeToFile("", result);
-
 
                         File f = new File (cacheindex_path);
@@ -494 +433 @@
                                         fw.close();
                                 } catch (IOException e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
+                                        log.error(Utils.errorMessage(e));
                                 }       
                         } catch (IOException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
-                        }
-                } catch (TransformerConfigurationException e2) {
-                        // TODO Auto-generated catch block
-                        e2.printStackTrace();
-                } catch (TransformerFactoryConfigurationError e2) {
-                        // TODO Auto-generated catch block
-                        e2.printStackTrace();
-                }
-                
-                        
-
-                /*
-                File f = new File (Admin.getConfig().getProperty("cache.path") + "counter.txt");
-            
-                try {
-                        Writer output = new BufferedWriter(new FileWriter(f));          
-              //FileWriter always assumes default encoding is OK!
-                        try {
-                                output.write( i);
-                        } finally {
-                                output.close();
-                        }       
-                } catch (IOException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                }
-                */
+                                log.error(Utils.errorMessage(e));
+                        }
+                } catch (TransformerConfigurationException e) {
+                        log.error(Utils.errorMessage(e));
+                } catch (TransformerFactoryConfigurationError e) {
+                        log.error(Utils.errorMessage(e));
+                }
+                
         }
         
         public InputStream clear(HashMap<String,String> clear_params) throws ParserConfigurationException, TransformerConfigurationException, TransformerException, TransformerFactoryConfigurationError {
                 String xpath_expr = "";
-                Integer removed = 0;
                 InputStream is = null;
                 
@@ -604 +520 @@
                         Result outputTarget = new StreamResult(outputStream); 
                         TransformerFactory.newInstance().newTransformer().transform(xmlSource, outputTarget); 
-                        is = new ByteArrayInputStream(outputStream.toByteArray()); 
-
-                        removed = list.getLength();
+                        is = new ByteArrayInputStream(outputStream.toByteArray());
                 
                 } catch (XPathExpressionException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
+                        log.error(Utils.errorMessage(e));
                 }