Changeset 980

Timestamp:

12/10/10 22:05:19 (13 years ago)

Author:

gaba

Message:

admin/cache/del - created, notifyUser-messages

Location:

MDService2/trunk/MDService2

Files:

• WebContent/index.jsp (modified) (2 diffs)
• WebContent/scripts/mdservice2_ui.js (modified) (7 diffs)
• WebContent/scripts/mdservice_widgets.js (modified) (1 diff)
• src/eu/clarin/cmdi/mdservice/action/AdminAction.java (modified) (3 diffs)
• src/eu/clarin/cmdi/mdservice/action/Cache.java (modified) (4 diffs)
• src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java (modified) (1 diff)
• src/struts.xml (modified) (1 diff)

MDService2/trunk/MDService2/WebContent/index.jsp

@@ -39 +39 @@
                                         <% }%>
                         </div>
-                <div id="notify" class="cmds-elem-plus note"></div>
+                        <div id="notify" class="cmds-elem-plus note" >
+                                <div id="notifylist" class="note"> <!--  class="cmds-elem-plus note" > -->
+                                </div>
+                        </div>
+                        
+                
         <!-- <a href="static/profiles_stats.html" >Info from CompReg and DCR about Elements vs. DatCats</a>  --> 
         </div>
@@ -143 +148 @@
         <div id="detail-float">  
         </div>
+        <div id="notify-float">  
+        </div>
         <div id="detail">               
         </div>  

MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js

@@ -118 +118 @@
 
 
+function showNotifyMessages(){
+        try {
+                $('#notify-float').html($('#notify').html());
+                var title = "Notify - Messages";
+                $('#notify-float').dialog( "option", "title", title );
+                
+                //ui-state-default
+                $('#notify-float').dialog('open');
+                $('#notify-float').siblings('div.ui-dialog-titlebar').addClass('ui-state-default');
+                $('#notify-float').siblings('div.ui-dialog-titlebar').children().remove();
+                var x = '<span class="cmd cmd_del ui-dialog-titlebar-del "/><span class="cmd cmd_up ui-dialog-titlebar-up"/><span>' + title +'</span>';
+                $('#notify-float').siblings('div.ui-dialog-titlebar').prepend(x);
+                
+                } catch (e) {
+                        notifyUser(e,'debug');
+                }               
+}
+
 function showDetail(data, textStatus) { 
         try {
@@ -159 +177 @@
 }
 
-function notifyUser (msg) {     
-          $('#notify').text(msg);          
+function getNotifyMessagesText(){
+        var text = "";
+        for(var i=0;i<notify_messages.length;i++){
+                text = text  + "/n" + notify_messages[i].getText();
+        }
+        return text;
+}
+function notifyUser (msg) {
+        var notifymessage = new NotifyMessage(new Date(),msg);  
+        notifyset.add(notifymessage);
+          //notify_messages[notify_messages.length] = new NotifyMessage( new Date(),msg);
+          //$('#notify').text(msg);
+          //$('#notify').text(getNotifyMessagesText());
+          //$('#notify-all').find('textarea').attr("value",$('#notify-all').find('textarea').attr("value") + '\n' + msg);
 }
 
@@ -168 +198 @@
                         console.log(msg);
                 } else {
-                $('#notify').text(msg);    
+                        var notifymessage = new NotifyMessage(new Date(),msg);  
+                        notifyset.add(notifymessage);
+                        //notify_messages[notify_messages.length] = new NotifyMessage(new Date(),msg);
+                        //$('#notify').text(msg);       
+                        //$('#notify').text(getNotifyMessagesText());
+                        //$('#notify-all').find('textarea').attr("value",$('#notify-all').find('textarea').attr("value") + '\n' + msg);
           }
 }
@@ -176 +211 @@
 function addToQuerylist (x) {   
         $("#querylist").prepend(x);     
+}
+
+function addToNotifylist (x) {  
+        $("#notifylist").prepend(x);    
 }
 
@@ -1303 +1342 @@
         $('.ui-dialog-titlebar-up').live('click', function(event){
                 var t = $(this).parents('.ui-widget').children('.ui-dialog-content');
-                $(t).find(".ui-dialog-buttonpane:first, .ui-dialog-content").stop({clearQueue:true}).fadeOut(300);
-                $(t).stop({clearQueue:true}).animate({height:'0px'},300)
+                
+                $(this).parents('.ui-widget').attr("tempheight",$(this).parents('.ui-widget').height());
+                //notifyUser("up(height):" + $(this).parents('.ui-widget').height(),'debug');
+                $(this).parents('.ui-widget').height(30);
+                //notifyUser("up(tempheight):" + $(this).parents('.ui-widget').attr("tempheight"),'debug');
+                
+                
+                //$(t).find(".ui-dialog-buttonpane:first, .ui-dialog-content").stop({clearQueue:true}).fadeOut(300);
+                //$(t).stop({clearQueue:true}).animate({height:'0px'},300);
                 
                 $(this).removeClass('cmd_up ui-dialog-titlebar-up');
@@ -1311 +1357 @@
         $('.ui-dialog-titlebar-down').live('click', function(event){
                 var t = $(this).parents('.ui-widget').children('.ui-dialog-content');
-                $(t).find(".ui-dialog-content, .ui-dialog-buttonpane:first").stop({clearQueue:true}).fadeIn(800)
-                .end().stop({clearQueue:true}).animate({height:'100%'},300);
+                
+                var h = $(this).parents('.ui-widget').attr("tempheight");
+                //notifyUser("down(tempheight):" + h,'debug');
+                $(this).parents('.ui-widget').height(parseInt(h));
+                //notifyUser("down(height):" + $(this).parents('.ui-widget').height(),'debug');
+                
+                
+                //$(this).parents('.ui-widget').attr("tempheight",$(this).parents('.ui-widget').height());
+                //$(t).find(".ui-dialog-content, .ui-dialog-buttonpane:first").stop({clearQueue:true}).fadeIn(800)
+                //.end().stop({clearQueue:true}).animate({height:'100%'},300);
 
                 $(this).removeClass('cmd_down ui-dialog-titlebar-down');
@@ -1357 +1411 @@
                         $("#detail-float").dialog();
                         $("#detail-float").tabs();
+                        
+                        /// notify-messages
+                        $("#notify-float").dialog({ autoOpen: false,
+                                position: ['right','10px'],
+                                height: 200,
+                                width: 400,
+                                minHeigh: 100});                        
+                        $("#notify-float").dialog();
+                        $("#notify-float").tabs();
 
 }

MDService2/trunk/MDService2/WebContent/scripts/mdservice_widgets.js

@@ +1 @@
+
+
+function NotifyMessage(dt, msg){
+        this.dt = dt;
+        this.msg = msg;
+};
+
+NotifyMessage.prototype.getText = function(){
+
+        var month = this.dt.getMonth() + 1;
+        var day = this.dt.getDate();
+        var year = this.dt.getFullYear();
+        var h = this.dt.getHours();
+        var m = this.dt.getMinutes();
+        var s = this.dt.getSeconds();
+        var m =  year + "-" +  month + "-" + day + " "  + h + ":" + m + ":" + s + "  :" + this.msg;
+        return m;
+};
+
+
+NotifyMessage.prototype.render = function () {
+        var x = "<div id='" + this.listid + "' class='notify_wrapper ui-widget' >" +
+                        //"<span class='notifymessage_id'>" + this.listid + "</span>: " +
+                        "<span class='notifymessage'>" + this.getText() + "</span></div>";
+        addToNotifylist(x);     
+        
+        this.container = $('#' + this.listid );
+        $(this.container).find('.notifymessage').dblclick(function(){
+                showNotifyMessages();
+        });
+ };
+var notify_container = $("#notifylist"); 
+
+var notifyset = { notifymessages: [],
+        container: '#notifylist',
+                
+        add: function (notifymessage){
+                        
+                this.notifymessages[this.notifymessages.length] = notifymessage;
+                notifymessage.listid = "nm" + this.notifymessages.length;
+                notifymessage.render();                         
+        },
+
+        remove: function (mid) {                
+                 for (var i = 0; i < this.notifymessages.length; i++) {
+                        if (this.notifymessages[i].listid == mid) {
+                                this.notifymessages.splice(i, 1);
+                        } 
+                }       
+                $('#' + mid).remove();
+        }       
+};
+////////////////////////////////////////////////////////////////////////
+
 var collections_widget = null;
 var columns_widget = null;

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

@@ -1 +1 @@
 package eu.clarin.cmdi.mdservice.action;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
 
 import net.sf.json.JSONObject;
@@ -18 +23 @@
         
         private String proxy_key = "admin";
+        private String date;
+        private String datefrom;
+        private String dateto;
+        
+        @Override
+        protected void  initialize(){
+                setRepository(0);
+         }
+        public String getDate() {
+                return date;
+        }
 
+        public void setDate(String date) {
+                this.date = date;
+        }
+        
+        public String getDatefrom() {
+                return datefrom;
+        }
+
+        public void setDatefrom(String datefrom) {
+                this.datefrom = datefrom;
+        }
+
+        public String getDateto() {
+                return dateto;
+        }
+
+        public void setDateto(String dateto) {
+                this.dateto = dateto;
+        }
+
+        
         @Override 
         public String getFullFormat() {
@@ -34 +71 @@
         }
 
+        public String del() throws Exception {
+                
+                HashMap<String,String> clear_params = new HashMap<String,String>();
+                if (this.getActionkey() != null){
+                        clear_params.put("type", getActionkey());       
+                }
+                if (this.getRepository() != 0){
+                        clear_params.put("repository", String.valueOf(getRepository()));        
+                }       
+                if (this.getDate() != null){
+                        clear_params.put("date", getDate());    
+                }
+                if (this.getDatefrom() != null){
+                        clear_params.put("datefrom", getDatefrom());    
+                }
+                if (this.getDateto() != null){
+                        clear_params.put("dateto", getDateto());        
+                }
+                //int removed;
+                this.setResultStream(Cache.getCache().clear(clear_params));
+                
+                //String ret = "1";
+                //this.setResultStream( new ByteArrayInputStream(String.valueOf(removed).getBytes()));
+                
+                return SUCCESS;
+                
+                
+        }
         
-}
+        }

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

@@ -15 +15 @@
 */
 import java.util.Date;
+import java.util.HashMap;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -171 +172 @@
                 }
                 
-                DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd:hh-mm-ss");
+                DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-ddThh:mm:ss");
                 e.setAttribute("date", dateFormat.format(new Date()).toString());
                 cacheindex_doc.getFirstChild().appendChild(e);
@@ -235 +236 @@
                 return transformed;
         }
+        
         
          //TODO: sanitize-key
@@ -506 +508 @@
                 */
         }
+        
+        public InputStream clear(HashMap<String,String> clear_params) throws ParserConfigurationException, TransformerConfigurationException, TransformerException, TransformerFactoryConfigurationError {
+                String xpath_expr = "";
+                Integer removed = 0;
+                InputStream is = null;
+                
+                if (clear_params.size() > 0 ) {
+                        if (clear_params.containsKey("repository")){
+                                xpath_expr = xpath_expr + " and @repository='" + clear_params.get("repository") + "'";
+                        }
+                        if (clear_params.containsKey("type")){
+                                xpath_expr = xpath_expr + " and @type='" + clear_params.get("type") + "'";
+                        }
+                        if (clear_params.containsKey("date")){
+                                xpath_expr = xpath_expr + " and @date='" + clear_params.get("date") + "'";
+                        }
+                        if (clear_params.containsKey("datefrom")){
+                                xpath_expr = xpath_expr + " and @date >= '" + clear_params.get("datefrom") + "'";
+                        }
+                        if (clear_params.containsKey("dateto")){
+                                xpath_expr = xpath_expr + " and @date <= '" + clear_params.get("dateto") + "'";
+                        }
+                        if (xpath_expr.length()>0){
+                                xpath_expr = xpath_expr.substring(5);
+                        }
+                        xpath_expr = "//index/f[" + xpath_expr + "]";
+                } else {
+                        xpath_expr = "//index/f";
+                }
+        
+                ////////// remove index_lines  + files
+                String id,type,path;
+                File f;
+                //creating an XPathFactory:
+                XPathFactory factory = XPathFactory.newInstance();
+                //using this factory to create an XPath object: 
+                XPath xpath = factory.newXPath();
+                //XPath object created compiles the XPath expression: 
+                XPathExpression expr;
+                try {
+                        expr = xpath.compile(xpath_expr);
+                        //expression is evaluated with respect to a certain context node which is doc.
+                Object result = expr.evaluate(cacheindex_doc, XPathConstants.NODESET);
+                NodeList list = (NodeList) result;
+                
+                //create deleted_doc
+                DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+                DocumentBuilder docBuilder;
+                        docBuilder = docFactory.newDocumentBuilder();
+                        Document deleted_doc = docBuilder.newDocument();
+                        Element root = (Element) deleted_doc.createElement("index");
+                        root.setAttribute("count_deleted", String.valueOf(list.getLength()) );
+                        deleted_doc.appendChild(root);
+                        
+                        // delete items
+                        for(int i = 0;i< list.getLength();i++){
+                                
+                                id = list.item(i).getAttributes().getNamedItem("id").getNodeValue();
+                        type = list.item(i).getAttributes().getNamedItem("type").getNodeValue();
+                        path = cachepath + PREFIX + type + "_"+id + ".xml";
+                        f = new File (path);
+                        
+                        f.delete();
+                        cacheindex_doc.getFirstChild().removeChild(list.item(i));
+                        
+                        Element e = deleted_doc.createElement("f");
+                        e.setAttribute("filename", path);
+                        e.setAttribute("id", id);
+                        deleted_doc.getFirstChild().appendChild(e);
+                        }  
+                        
+                        //create resultstream
+                        ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); 
+                        Source xmlSource = new DOMSource(deleted_doc); 
+                        Result outputTarget = new StreamResult(outputStream); 
+                        TransformerFactory.newInstance().newTransformer().transform(xmlSource, outputTarget); 
+                        is = new ByteArrayInputStream(outputStream.toByteArray()); 
+
+                        removed = list.getLength();
+                
+                } catch (XPathExpressionException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+                
+                //////// set the index value
+                NodeList nl = cacheindex_doc.getElementsByTagName("f");
+                if (nl.getLength() < 1){
+                        cachecounter = 1;
+                }else {
+                        cachecounter = Integer.parseInt(nl.item(nl.getLength()-1).getAttributes().getNamedItem("id").getNodeValue());
+                }
+                this.updateCachecounter();
+                return is;
+        }
+
 }

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

@@ -58 +58 @@
         private String actionContentType;
         private String userMsg;
-        private int repository=1;
+        private int repository;
         //private Map<String,Object> session;
          private HttpServletRequest request; 
          private long duration = 0;
          
+         public GenericProxyAction(){
+                 super();
+                 initialize();
+         }
+         
+         protected void  initialize(){
+                 repository = 1;
+         }
         public String getQ() {
                 return q;

MDService2/trunk/MDService2/src/struts.xml

@@ -198 +198 @@
                            <param name="format">{2}</param>
                            <param name="actionkey">{1}</param>
+                            <result type="stream">                          
+                                <param name="contentType">${getActionContentType()}</param>
+                                <param name="inputName">resultStream</param>                            
+                            </result>
+                </action>
+                
+                <action name="admin/cache/del" class="eu.clarin.cmdi.mdservice.action.AdminAction" method="del"> 
                             <result type="stream">                          
                                 <param name="contentType">${getActionContentType()}</param>