Changeset 135:a9339f5b493a

Timestamp:

08/26/08 15:32:42 (5 years ago)

Author:

fbatard

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@136

Message:

Handling the new functionalities for the tasklist tree

Location:

org/w3c/unicorn

Files:

• Framework.java (modified) (3 diffs)
• UnicornCall.java (modified) (24 diffs)

org/w3c/unicorn/Framework.java

@@ -1 @@
-// $Id: Framework.java,v 1.12 2008-07-02 17:34:47 jean-gui Exp $
+// $Id: Framework.java,v 1.13 2008-08-26 15:32:42 fbatard Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -31 +31 @@
 import org.w3c.unicorn.tasklist.RDFUnmarshallerJena;
 import org.w3c.unicorn.tasklist.Task;
+import org.w3c.unicorn.tasklist.TaskListUnmarshallerBeans;
 import org.w3c.unicorn.tasklist.TasksListUnmarshaller;
-import org.w3c.unicorn.tasklist.TasksListUnmarshallerJAXB;
 import org.w3c.unicorn.util.ListFiles;
 import org.w3c.unicorn.util.LocalizedString;
@@ -214 +214 @@
                                         .get("PATH_TO_TASKLIST"), "\\.xml");
 
-                        final TasksListUnmarshaller aTaskListUnmarshaller = new TasksListUnmarshallerJAXB(
+                        final TasksListUnmarshaller aTaskListUnmarshaller = new TaskListUnmarshallerBeans(
                                         Framework.mapOfObserver);
                         for (final File aFile : tFileXML) {

org/w3c/unicorn/UnicornCall.java

@@ -1 @@
-// $Id: UnicornCall.java,v 1.10 2008-07-24 09:51:53 fbatard Exp $
+// $Id: UnicornCall.java,v 1.11 2008-08-26 15:32:42 fbatard Exp $
 // Author: Jean-Guilhem Rouel
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2006.
@@ -14 +14 @@
 
 import javax.activation.MimeType;
-import javax.xml.bind.JAXBException;
 
 import org.apache.commons.fileupload.FileItem;
@@ -25 +24 @@
 import org.w3c.unicorn.exceptions.NoDocumentException;
 import org.w3c.unicorn.exceptions.NoMimeTypeException;
-import org.w3c.unicorn.exceptions.UnsupportedMimeTypeException;
-import org.w3c.unicorn.generated.tasklist.TPriority;
 import org.w3c.unicorn.input.InputFactory;
 import org.w3c.unicorn.request.Request;
@@ -32 +29 @@
 import org.w3c.unicorn.response.Response;
 import org.w3c.unicorn.response.parser.ResponseParserFactory;
-import org.w3c.unicorn.tasklist.Observation;
 import org.w3c.unicorn.tasklist.Task;
 import org.w3c.unicorn.tasklist.parameters.Mapping;
 import org.w3c.unicorn.tasklist.parameters.Parameter;
 import org.w3c.unicorn.tasklist.parameters.Value;
+import org.w3c.unicorn.tasklisttree.TLTCond;
+import org.w3c.unicorn.tasklisttree.TLTExec;
+import org.w3c.unicorn.tasklisttree.TLTIf;
+import org.w3c.unicorn.tasklisttree.TLTNode;
 import org.w3c.unicorn.util.Property;
 
@@ -72 +72 @@
         private Map<String, String[]> mapOfStringParameter = null;
 
-        // Results
-        /**
-         * Data Structure for the response with high priority
-         */
-        private Map<String, Response> mapOfResponseHigh;
-
-        /**
-         * Data Structure for the response with medium priority
-         */
-        private Map<String, Response> mapOfResponseMedium;
-
-        /**
-         * Data Structure for the response with low priority
-         */
-        private Map<String, Response> mapOfResponseLow;
-
-        /**
-         * Tells if the high priority check passed
-         */
-        private boolean bPassedHigh;
-
-        /**
-         * Tells if the medium priority check passed
-         */
-        private boolean bPassedMedium;
-
-        /**
-         * Tells if the low priority check passed
-         */
-        private boolean bPassedLow;
+        /**
+         * Data Structure for the response
+         */
+        private Map<String, Response> mapOfResponse;
 
         /**
@@ -121 +95 @@
                 this.mapOfStringParameter = new LinkedHashMap<String, String[]>();
 
-                this.mapOfResponseHigh = new LinkedHashMap<String, Response>();
-                this.mapOfResponseMedium = new LinkedHashMap<String, Response>();
-                this.mapOfResponseLow = new LinkedHashMap<String, Response>();
-
-                this.bPassedHigh = true;
-                this.bPassedMedium = true;
-                this.bPassedLow = true;
-
+                this.mapOfResponse = new LinkedHashMap<String, Response>();
                 this.nbActiveThreads = 0;
         }
@@ -200 +167 @@
                                         .debug("MimeType : " + aMimeType.toString() + ".");
                 }
-                /*
-                 * Check if the mimetype is handle by the asked task redirect
-                 * automatically to another input method if this one does not support
-                 * this mimetype
-                 */
-                if (!this.aTask.allowMimeType(aMimeType)) {
-                        UnicornCall.logger.error("Task " + this.aTask.getID()
-                                        + " does not support the mimetype " + aMimeType.toString()
-                                        + ".");
-                        throw new UnsupportedMimeTypeException(aMimeType.toString() + ".");
-                }
+
 
                 // Create input method
@@ -216 +173 @@
                                 this.aEnumInputMethod, this.oInputParameterValue);
 
+                this.doNode(aInputFactory,this.aTask.getTree());
+                
+                
+                aInputFactory.dispose();
+        }
+        
+        /**
+         * Main function called to do the recursion over the Task tree to launch the requests
+         * @param aInputFactory InputFactory used for the resquests
+         * @param node the current node that we're parsing in the Task tree
+         * @throws Exception raised from generateRequestList and doRequest
+         */
+        private void doNode(InputFactory aInputFactory,TLTNode node) throws Exception{
                 // Generate the list of request
+                UnicornCall.logger.trace("doNode.");
+                if (UnicornCall.logger.isDebugEnabled()) {
+                        UnicornCall.logger.debug("InputFactory : " + aInputFactory
+                                        + ".");
+                        UnicornCall.logger.debug("Current node : "
+                                        + node + ".");
+                }
+                if(node!=null){
                 this.aRequestList = this.generateRequestList(aInputFactory,
-                                this.mapOfStringParameter);
+                                this.mapOfStringParameter,node);
 
                 if (UnicornCall.logger.isDebugEnabled()) {
@@ -226 +204 @@
 
                 // send requests to observer
-                this.bPassedHigh = this.doRequests(TPriority.HIGH);
-                if (!this.bPassedHigh)
-                        return;
-                this.bPassedMedium = this.doRequests(TPriority.MEDIUM);
-                if (!this.bPassedMedium)
-                        return;
-                this.bPassedLow = this.doRequests(TPriority.LOW);
-
-                aInputFactory.dispose();
-        }
-
+                this.doRequests();
+                
+                UnicornCall.logger.info("Check the condition of the Ifs");
+                //browse the conditions to do the connection
+                for(TLTIf ifs: node.getIfList()){
+                        if(this.checkCond(ifs))this.doNode(aInputFactory,ifs.getIfOk());
+                        else this.doNode(aInputFactory,ifs.getIfNotOk());
+                }
+                }
+                else{
+                        //Inform if the node is null
+                        if (UnicornCall.logger.isDebugEnabled()) {
+                                UnicornCall.logger
+                                                .debug("The node is null at this point.");
+                        }
+                }
+                
+        }
+        
+        /**
+         * Check the conditions of the if branch it makes a OR between all conditions
+         * @param ifs the if branch to check
+         * @return whether or not the conditions are true
+         */
+        private boolean checkCond(TLTIf ifs){
+                UnicornCall.logger.trace("checkCond.");
+                if (UnicornCall.logger.isDebugEnabled()) {
+                        UnicornCall.logger.debug("If node : " + ifs
+                                        + ".");
+                }
+                boolean conditionOK=true;
+                //TODO boolean to manage the OR in the conditions, if the donc is false we change the boolean to false , if not we don't care
+                //that will simulate the OR
+                for(TLTCond cond:ifs.getCondArray()){
+                        
+                }
+                return conditionOK;
+        }
+        
+        /**
+         * Creates the map of all the Observer to call in the current node
+         * @param node the current node of the Task tree we are parsing
+         */
+        private Map<String,Observer> createExecList(TLTNode node){
+                Map<String,Observer> mapOfCurrentNodeObserver=new LinkedHashMap<String, Observer>();
+                for (TLTExec exec : node.getExecutionList()) {
+                        mapOfCurrentNodeObserver.put(exec.getValue(),exec.getObserver());
+                }
+                return mapOfCurrentNodeObserver;
+        }
+        
+        
         /**
          * Adds 1 to active threads number
@@ -280 +299 @@
          *             Input/Output error
          */
-        private boolean doRequests(final TPriority aTPriority) throws IOException,
-                        JAXBException {
+        private boolean doRequests() throws IOException{
                 UnicornCall.logger.trace("doRequest");
-                if (UnicornCall.logger.isDebugEnabled()) {
-                        UnicornCall.logger.debug("Priority : " + aTPriority + ".");
-                }
 
                 bPassed = true;
-
-                final Map<String, Response> mapOfResponse;
-                switch (aTPriority) {
-                case HIGH:
-                        mapOfResponse = this.mapOfResponseHigh;
-                        break;
-                case LOW:
-                        mapOfResponse = this.mapOfResponseLow;
-                        break;
-                case MEDIUM:
-                        mapOfResponse = this.mapOfResponseMedium;
-                        break;
-                default:
-                        mapOfResponse = null;
-                }
+                
                 final Map<String, Request> requests = this.aRequestList
-                                .getRequest(aTPriority);
+                                .getRequestMap();
                 // Creation of the thread list
                 ArrayList<Thread> threadsList = new ArrayList<Thread>();
@@ -339 +340 @@
          * @param mapOfArrayUseParameter
          *            array of the parameter
+         * @param node the current node that we are parsing           
          * @return the list of the request for the call
          * @throws Exception
          *             error occured during the process
          */
-        //TODO Changer la génération de la liste pour prendre en compte les level d'execution
-        //Adapter la Map dans la RequestList 
-        //Dans le doTask on bouclera tant qu'on trouve des lvl d'execution superieur
         private RequestList generateRequestList(final InputFactory aInputFactory,
-                        final Map<String, String[]> mapOfArrayUseParameter)
+                        final Map<String, String[]> mapOfArrayUseParameter,TLTNode node)
                         throws Exception {
 
@@ -357 +356 @@
                                         + mapOfArrayUseParameter + ".");
                 }
-
+                 
                 final MimeType aMimeType = aInputFactory.getMimeType();
                 final EnumInputMethod aEnumInputMethod = aInputFactory
@@ -365 +364 @@
                 // Iterate over all observation of this task to build a basic
                 // request list with only the url of observator and input parameter
-                for (final Observation aObservation : this.aTask.getMapOfObservation()
-                                .values()) {
-                        final Observer aObserver = aObservation.getObserver();
+                //Il faut creer une list avec tous les exec et toutes les rencardeur de ifs
+                //Une liste d'Observer
+                
+                for (final Observer aObserver : this.createExecList(node).values()) {
                         final String sObserverID = aObserver.getID();
                         // add only observer who handle the current mimetype
@@ -403 +403 @@
                                         }
 
-                                        final InputMethod aInputMethod = aObservation.getObserver()
+                                        final InputMethod aInputMethod = aObserver
                                                         .getInputMethod(aEIM);
                                         // create a new request with input parameter
@@ -414 +414 @@
                                         // add this request to request list
 
-                                        aRequestList.addRequest(aRequest, aObservation
-                                                        .getPriority(aMimeType), sObserverID);
+                                        aRequestList.addRequest(aRequest,""+node.getID());
                                         // log debug information
                                         if (UnicornCall.logger.isDebugEnabled()) {
@@ -461 +460 @@
 
                         // Get name of the lang parameter (defined in RDF file)
-                        String observerParamLangName = aObservation.getObserver()
+                        String observerParamLangName = aObserver
                                         .getParamLangName();
 
@@ -471 +470 @@
 
                         // Add this request to request list
-                        aRequestList.addRequest(aRequest, aObservation
-                                        .getPriority(aMimeType), sObserverID);
+                        aRequestList.addRequest(aRequest,""+node.getID());
                         // Log debug information
                         if (UnicornCall.logger.isDebugEnabled()) {
@@ -513 +511 @@
                                         UnicornCall.logger.warn("Parameter " + sTaskParameterName
                                                         + " has no value intput and no default value.");
-                                        // TODO check if this parameter is required
                                         continue;
                                 }
@@ -540 +537 @@
                                 final Map<String, List<Mapping>> mapOfMapping = aValue
                                                 .getMapOfMapping();
+                                
                                 for (final String sObserverName : mapOfMapping.keySet()) {
-                                        final Observation aObservation = this.aTask
-                                                        .getMapOfObservation().get(sObserverName);
+                                        
                                         final Request aRequest = aRequestList
                                                         .getRequest(sObserverName);
-                                        final TPriority aTPriority = aObservation
-                                                        .getPriority(aMimeType);
-                                        if (null == aTPriority) {
-                                                if (UnicornCall.logger.isDebugEnabled()) {
-                                                        UnicornCall.logger.debug("Observator "
-                                                                        + sObserverName + " unhandle mimetype "
-                                                                        + aMimeType.getBaseType() + ".");
-                                                }
-                                                continue;
-                                        }
+                                        
                                         for (final Mapping aMapping : mapOfMapping
                                                         .get(sObserverName)) {
@@ -566 +554 @@
                                                 aRequest.addParameter(aMapping.getParam(), sValue);
                                         }
+                                        
                                 } // foreach mapOfMapping.keySet()
+                                
                                 continue;
                         }
+                        
                         for (final String sUseParameterValue : tStringUseParameterValue) {
                                 final Value aValue = mapOfValue.get(sUseParameterValue);
@@ -574 +565 @@
                                                 .getMapOfMapping();
                                 for (final String sObserverName : mapOfMapping.keySet()) {
-                                        final Observation aObservation = this.aTask
-                                                        .getMapOfObservation().get(sObserverName);
                                         final Request aRequest = aRequestList
                                                         .getRequest(sObserverName);
-                                        final TPriority aTPriority = aObservation
-                                                        .getPriority(aMimeType);
-                                        if (null == aTPriority) {
-                                                if (UnicornCall.logger.isDebugEnabled()) {
-                                                        UnicornCall.logger.debug("Observator "
-                                                                        + sObserverName + " unhandle mimetype "
-                                                                        + aMimeType.getBaseType() + ".");
-                                                }
-                                                continue;
-                                        }
+                                        
                                         for (final Mapping aMapping : mapOfMapping
                                                         .get(sObserverName)) {
@@ -602 +582 @@
                                 } // foreach mapOfMapping.keySet()
                         } // foreach sArrayParameterValue
+                        
                 } // foreach this.parameters.values()
+        
                 return aRequestList;
         }
 
         /**
-         * Returns the responses of high priority observations.
-         * 
-         * @return responses of high priority observations.
-         */
-        public Map<String, Response> getHighResponses() {
-                return this.mapOfResponseHigh;
-        }
-
-        /**
-         * Returns the responses of medium priority observations.
-         * 
-         * @return Returns the responses of medium priority observations.
-         */
-        public Map<String, Response> getMediumResponses() {
-                return this.mapOfResponseMedium;
-        }
-
-        /**
          * Returns the responses of low priority observations.
          * 
          * @return responses of low priority observations.
          */
-        public Map<String, Response> getLowResponses() {
-                return this.mapOfResponseLow;
-        }
-
-        /**
-         * Return the boolean if high checks have passed
-         * 
-         * @return Returns the highPassed.
-         */
-        public boolean haveHighPassed() {
-                return this.bPassedHigh;
-        }
-
-        /**
-         * Return the boolean if low checks have passed
-         * 
-         * @return Returns the lowPassed.
-         */
-        public boolean haveLowPassed() {
-                return this.bPassedLow;
-        }
-
-        /**
-         * Return the boolean if medium checks have passed
-         * 
-         * @return Returns the mediumPassed.
-         */
-        public boolean haveMediumPassed() {
-                return this.bPassedMedium;
+        public Map<String, Response> getResponses() {
+                return this.mapOfResponse;
         }
 
@@ -715 +652 @@
          */
         public Map<String, Response> getObservationList() {
-                final Map<String, Response> mapOfResponse;
-                mapOfResponse = new LinkedHashMap<String, Response>();
-                mapOfResponse.putAll(this.mapOfResponseHigh);
-                mapOfResponse.putAll(this.mapOfResponseMedium);
-                mapOfResponse.putAll(this.mapOfResponseLow);
                 return mapOfResponse;
         }
@@ -875 +807 @@
                         }
                 }
+                
 
                 synchronized (mapOfResponse) {