| 6 |
|
import java.net.*; |
| 7 |
|
import java.util.*; |
| 8 |
|
import uk.ac.ukc.iscream.core.*; |
| 9 |
+ |
import uk.ac.ukc.iscream.componentmanager.*; |
| 10 |
|
import uk.ac.ukc.iscream.filter.*; |
| 11 |
|
import uk.ac.ukc.iscream.util.*; |
| 12 |
|
|
| 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 |
> |
* @param parent a CORBA reference to our parent filter |
| 42 |
|
*/ |
| 43 |
|
public FilterThread(Queue queue, Filter parent){ |
| 44 |
|
_parent = parent; |
| 45 |
|
_queue = queue; |
| 46 |
< |
_logger.write(toString(), Logger.DEBUG, "created"); |
| 46 |
> |
_logger.write(toString(), Logger.SYSINIT, "created"); |
| 47 |
|
} |
| 48 |
|
|
| 49 |
|
//---PUBLIC METHODS--- |
| 50 |
|
|
| 51 |
|
/** |
| 52 |
< |
* Runs the thread |
| 52 |
> |
* Runs the thread, getting data from the Queue and |
| 53 |
> |
* sending it on to the parent filter. |
| 54 |
|
*/ |
| 55 |
|
public void run(){ |
| 56 |
+ |
// setup the XMLPacketMaker |
| 57 |
+ |
XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(); |
| 58 |
|
// get a queue for ourselves |
| 59 |
|
int n = _queue.getQueue(); |
| 60 |
< |
// keep this out here, saves recreating the object |
| 60 |
> |
// keep these out here, saves recreating the object |
| 61 |
|
String xml = null; |
| 62 |
|
while(true) { |
| 63 |
|
// get a String of xml |
| 77 |
|
xml = xml.substring(0, xml.length()); |
| 78 |
|
} |
| 79 |
|
|
| 80 |
+ |
// Bundle the XML all on one line (saves space and simplifies |
| 81 |
+ |
// the protocol between clientinterface and client). |
| 82 |
+ |
StringTokenizer tokenizer = new StringTokenizer(new String(xml), "\n"); |
| 83 |
+ |
xml = ""; |
| 84 |
+ |
while (tokenizer.hasMoreTokens()) { |
| 85 |
+ |
xml += tokenizer.nextToken(); |
| 86 |
+ |
} |
| 87 |
+ |
|
| 88 |
|
// Use XMLPacketMaker to make an XMLPacket object. |
| 89 |
< |
XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml); |
| 90 |
< |
XMLPacket packet = xmlPacketMaker.createXMLPacket(); |
| 91 |
< |
|
| 92 |
< |
if(packet != null && PluginFilterManager.getInstance().runFilters(packet)) { |
| 93 |
< |
// packet is not null |
| 94 |
< |
// packet was not dropped by a plugin |
| 95 |
< |
// ... best pass it on ! |
| 89 |
> |
XMLPacket packet = null; |
| 90 |
> |
try { |
| 91 |
> |
packet = xmlPacketMaker.createXMLPacket(xml); |
| 92 |
> |
} catch(InvalidXMLException e) { |
| 93 |
> |
_logger.write(toString(), Logger.ERROR, "Invalid XML: "+e); |
| 94 |
> |
// skip the rest of this loop iteration |
| 95 |
> |
continue; |
| 96 |
> |
} |
| 97 |
> |
|
| 98 |
> |
// XMLPacket is ok, so run filters... |
| 99 |
> |
if(PluginFilterManager.getInstance().runFilters(packet)) { |
| 100 |
> |
// and pass it on... |
| 101 |
|
_parent.receiveXML(xml); |
| 102 |
|
} |
| 103 |
|
else { |
| 104 |
< |
// either we had a null, or a plugin dropped it |
| 104 |
> |
// ... or filtered it |
| 105 |
|
_logger.write(toString(), Logger.DEBUG, "An XML packet was sucessfully filtered from the system."); |
| 106 |
|
} |
| 107 |
|
} |
