[Carrot2-cvs] carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/struts/forms QueryForm.java,1.1.1.1,1.2

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

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

Modified Files:
	QueryForm.java 
Log Message:
[new] Default process definition can be now specified in the configuration.


Index: QueryForm.java
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/struts/forms/QueryForm.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** QueryForm.java	19 Sep 2003 10:16:02 -0000	1.1.1.1
--- QueryForm.java	24 Nov 2003 22:45:19 -0000	1.2
***************
*** 17,20 ****
--- 17,25 ----
  
  import org.apache.struts.action.*;
+ 
+ import com.dawidweiss.carrot.controller.carrot2.Carrot2InitServlet;
+ import com.dawidweiss.carrot.controller.carrot2.process.ProcessDefinition;
+ import com.dawidweiss.carrot.controller.carrot2.process.ProcessingChainLoader;
+ 
  import javax.servlet.ServletContext;
  import javax.servlet.http.*;
***************
*** 101,104 ****
--- 106,119 ----
          {
              resultsRequested = 100;
+         }
+         
+         if (processingChain == null)
+         {
+             ProcessingChainLoader processingChainLoader =
+                 (ProcessingChainLoader) application
+                     .getAttribute(Carrot2InitServlet.CARROT_PROCESSINGCHAINS_LOADER);
+             ProcessDefinition process = processingChainLoader.getDefaultProcess();
+             if (process != null)
+                 processingChain = process.getId();
          }
      }