ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterThread.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/FilterThread.java (file contents):
Revision 1.15 by tdb, Fri Jan 12 00:45:25 2001 UTC vs.
Revision 1.33 by tdb, Wed Mar 20 13:05:49 2002 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.ac.ukc.iscream.filter;
2 > package uk.org.iscream.cms.server.filter;
3  
4   //---IMPORTS---
5   import java.io.*;
6   import java.net.*;
7   import java.util.*;
8 < import uk.ac.ukc.iscream.core.*;
9 < import uk.ac.ukc.iscream.filter.*;
10 < import uk.ac.ukc.iscream.util.*;
8 > import uk.org.iscream.cms.server.core.*;
9 > import uk.org.iscream.cms.server.componentmanager.*;
10 > import uk.org.iscream.cms.server.filter.*;
11 > import uk.org.iscream.cms.server.util.*;
12  
13   /**
14   * Handle an incoming packet as a separate thread.
# Line 34 | Line 35 | public class FilterThread extends Thread{
35   //---CONSTRUCTORS---
36    
37      /**
38 <     * Class constructor.
38 >     * Constructs an instance of a FilterThread
39 >     *
40 >     * @param queue the Queue this filter is using
41       */
42 <    public FilterThread(Queue queue, Filter parent){
43 <        _parent = parent;
42 >    public FilterThread(Queue queue){
43 >        // set the Thread name
44 >        setName("filter.FilterThread");
45 >        
46          _queue = queue;
47 <        _logger.write(toString(), Logger.DEBUG, "created");
47 >        _logger.write(toString(), Logger.SYSINIT, "created");
48      }
49  
50   //---PUBLIC METHODS---
51  
52      /**
53 <     * Runs the thread
53 >     * Runs the thread, getting data from the Queue and
54 >     * sending it on to the parent filter.
55       */
56      public void run(){
57 +        // setup the XMLPacketMaker
58 +        XMLPacketMaker xmlPacketMaker = new XMLPacketMaker();
59          // get a queue for ourselves
60          int n = _queue.getQueue();
61 <        // keep this out here, saves recreating the object
61 >        // keep these out here, saves recreating the object
62          String xml = null;
63 +        String parentFilterName = "";
64 +        Filter parent = null;
65          while(true) {
66              // get a String of xml
67              try {
# Line 70 | Line 80 | public class FilterThread extends Thread{
80                  xml = xml.substring(0, xml.length());
81              }
82              
83 +            // Bundle the XML all on one line (saves space and simplifies
84 +            // the protocol between clientinterface and client).
85 +            StringTokenizer tokenizer = new StringTokenizer(new String(xml), "\n");
86 +            xml = "";
87 +            while (tokenizer.hasMoreTokens()) {
88 +                xml += tokenizer.nextToken();
89 +            }
90 +            
91              // Use XMLPacketMaker to make an XMLPacket object.
92 <            XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
93 <            XMLPacket packet = xmlPacketMaker.createXMLPacket();
94 <                  
95 <            if(packet != null && PluginFilterManager.getInstance().runFilters(packet)) {
96 <                // packet is not null
97 <                // packet was not dropped by a plugin
98 <                // ... best pass it on !
81 <                _parent.receiveXML(xml);
92 >            XMLPacket packet = null;
93 >            try {
94 >                packet = xmlPacketMaker.createXMLPacket(xml);
95 >            } catch(InvalidXMLException e) {
96 >                _logger.write(toString(), Logger.ERROR, "Invalid XML: "+e);
97 >                // skip the rest of this loop iteration
98 >                continue;
99              }
100 +            
101 +            // get parent
102 +            try {
103 +                String newParent = ConfigurationProxy.getInstance().getProperty("Filter." + FilterMain.NAME, "Filter.parentFilter");
104 +                if(!parentFilterName.equals(newParent)) {
105 +                    parentFilterName = newParent;
106 +                    parent = FilterHelper.narrow(_refman.getCORBARef("iscream.Filter." + parentFilterName));
107 +                    _logger.write(toString(), Logger.DEBUG, "Parent filter changed to: "+parentFilterName);
108 +                }
109 +            } catch (PropertyNotFoundException e) {
110 +                continue;
111 +            }
112 +                    
113 +            // XMLPacket is ok, run filters...
114 +            if(PluginFilterManager.getInstance().runFilters(packet)) {
115 +                // and pass it on...
116 +                parent.receiveXML(xml);
117 +            }
118              else {
119 <                // either we had a null, or a plugin dropped it
119 >                // ... or filtered it
120                  _logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system.");
121              }
122          }
# Line 91 | Line 126 | public class FilterThread extends Thread{
126       * Overrides the {@link java.lang.Object#toString() Object.toString()}
127       * method to provide clean logging (every class should have this).
128       *
129 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
129 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
130       * to format the toString()
131       *
132       * @return the name of this class and its CVS revision
# Line 108 | Line 143 | public class FilterThread extends Thread{
143   //---ACCESSOR/MUTATOR METHODS---
144  
145   //---ATTRIBUTES---
111
112    /**
113     * Our parent filter
114     */
115    Filter _parent;
146      
147      /**
148       * The Queue object
# Line 135 | Line 165 | public class FilterThread extends Thread{
165       * system logger that is being used.
166       */
167      private Logger _logger = ReferenceManager.getInstance().getLogger();
168 +
169 +    /**
170 +     * A reference to the reference manager in use
171 +     */
172 +    private ReferenceManager _refman = ReferenceManager.getInstance();
173  
174   //---STATIC ATTRIBUTES---
175  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines