[Carrot2-cvs] carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2 RequestHistory.java,NONE,1.1 Carrot2InitServlet.java,1.3,1.4

[<daw...@us...>]

Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2
In directory sc8-pr-cvs1:/tmp/cvs-serv14986/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2

Modified Files:
	Carrot2InitServlet.java 
Added Files:
	RequestHistory.java 
Log Message:
[new], component: carrot2.controller.carrot2-web
Recent queries list added (queries history).

[new], component: carrot2.controller.carrot2-web
Short help added to the welcome page.

--- NEW FILE: RequestHistory.java ---
package com.dawidweiss.carrot.controller.carrot2;

import com.dawidweiss.carrot.controller.carrot2.process.ProcessDefinition;
import com.dawidweiss.carrot.controller.carrot2.xmlbinding.query.Query;


/**
 * A request history that can be attached to QueryProcessor.
 */
public final class RequestHistory
{
    private final Query [] queries;
    private final ProcessDefinition [] processes;
    private final int max;
    private int position;
    private int last;  
    

    /**
     * Creates a new request history with some predefined length.
     */
    public RequestHistory(int length)
    {
        position = 0;
        last = 0;
        queries = new Query [ length + 1 ];
        processes = new ProcessDefinition [ length + 1 ];
        max = length + 1;
    }

    public void push(Query query, ProcessDefinition process)
    {
        synchronized (this) {
            queries[position] = query;
            processes[position] = process;
            position = (position + 1) % max;
            if (position == last) {
                last = (last + 1) % max;
            }
        }
    }

    public int getHistory(int max, Query [] query, ProcessDefinition [] process)
    {
        final int localmax = this.max; 
        synchronized (this) {
            int from = last;
            int k = 0;
            
            while (from != position && max > 0) {
                query[k] = this.queries[from];
                process[k] = this.processes[from]; 
                
                max--;
                k++;
                from = (from + 1) % localmax;
            }
            return k;
        }
    }

}

Index: Carrot2InitServlet.java
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/Carrot2InitServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Carrot2InitServlet.java	24 Nov 2003 22:45:19 -0000	1.3
--- Carrot2InitServlet.java	26 Nov 2003 22:24:37 -0000	1.4
***************
*** 62,65 ****
--- 62,69 ----
      private boolean allowReloading = false;
  
+     /** Extra configuration properties */    
+     private HashMap properties = new HashMap(3);
+ 
+ 
      /**
       * Initialize Carrot2 environment.
***************
*** 221,225 ****
                      }
                  }
!                 
  
                  //
--- 225,260 ----
                      }
                  }
! 
!                 // Set properties
!                 List propertiesElementsList = root.getChildren("properties");
!                 if (propertiesElementsList.size() > 1)
!                 {
!                     throw new RuntimeException("errors.initialization.too-many-properties");
!                 }
!                 else
!                 {
!                     if (propertiesElementsList.size() != 0)
!                     {
!                         propertiesElementsList = ((Element) propertiesElementsList.get(0)).getChildren();
!                         
!                         for (Iterator i = propertiesElementsList.iterator();i.hasNext();)
!                         { 
!                             Element propertyElement = (Element) i.next();
!                             if (!"property".equals(propertyElement.getName()))
!                             {
!                                 throw new RuntimeException("errors.initialization.config-structure-error");
!                             }
!                            
!                             String propName = propertyElement.getAttributeValue("name");
!                             String value = propertyElement.getAttributeValue("value");
!                             if (propName == null || value == null)
!                             {
!                                 throw new RuntimeException("errors.initialization.config-structure-error");
!                             }
!                             
!                             this.properties.put(propName, value);
!                         }
!                     }
!                 }
  
                  //
***************
*** 361,364 ****
--- 396,412 ----
                             .booleanValue()
                  );
+                 
+                 //
+                 // Check properties. 
+                 //
+                 
+                 if (this.properties.containsKey("request-history"))
+                 {
+                     int v = Integer.valueOf((String) properties.get("request-history")).intValue();
+                     if (v <= 0)
+                         throw new IllegalArgumentException("Request history must be greater than zero.");
+                     processor.setRequestHistory(new RequestHistory(v));
+                 }
+ 
  
                  //