diff options
Diffstat (limited to 'src/YalpServer/ServerControlImpl.java')
| -rwxr-xr-x | src/YalpServer/ServerControlImpl.java | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/src/YalpServer/ServerControlImpl.java b/src/YalpServer/ServerControlImpl.java index 0f33ff6..3947cdd 100755 --- a/src/YalpServer/ServerControlImpl.java +++ b/src/YalpServer/ServerControlImpl.java @@ -38,9 +38,14 @@ import org.apache.log4j.PropertyConfigurator; public class ServerControlImpl extends ServerControlInterfacePOA {
private ORB orb;
+
private InitServer srv;
+ private InputPluginHandler inputHandler;
+
private String log4jFile = "log4j_server.conf";
- private static Logger logger = Logger.getLogger("Yalp.Server");
+
+ private static Logger logger =
+ Logger.getLogger("Yalp.Server.ServerControlImpl");
public ServerControlImpl() {
PropertyConfigurator.configureAndWatch(log4jFile);
@@ -52,9 +57,10 @@ public ServerControlImpl() { orb = _orb;
}
- public void init(InitServer srv) {
+ public void init(InitServer _srv) {
logger.debug("init()");
- this.srv=srv;
+ srv = _srv;
+ inputHandler = srv.inputHandler;
}
/*
@@ -194,8 +200,7 @@ public ServerControlImpl() { YalpErrorHolder err ) {
logger.debug("search()");
YalpError error = new YalpError();
- error.code = YalpErrorCode.OK;
- err = new YalpErrorHolder(error);
+ inputHandler.search(str, types, result, err);
}
/*
@@ -268,12 +273,23 @@ public ServerControlImpl() { public void registerInputPlugin( org.omg.CORBA.Object itf,
PluginInfoHolder info, YalpErrorHolder err )
{
- logger.debug("registerInputPlugins()");
- /* t.b.d. itf handling */
- System.out.println("registering input plugin: " + info.value.name );
+ logger.info("registering input plugin: " + info.value.name );
+ InputPluginInterface inputItf;
+ try {
+ inputItf = InputPluginInterfaceHelper.narrow(itf);
+ } catch( Exception e ) {
+ e.printStackTrace();
+ return;
+ }
+ logger.debug("create new InputPlugin");
+ InputPlugin newPlugin = new InputPlugin(inputItf, info.value);
+ logger.debug("add new InputPlugin to Handler");
+ if( newPlugin != null )
+ inputHandler.addPlugin( newPlugin );
+ logger.debug("error handling");
YalpError error = new YalpError();
- error.msg = "huhu";
- error.descr = "hihi";
+ error.msg = "plugin registered";
+ error.descr = "";
error.code = YalpErrorCode.OK;
error.level = YalpErrorLevel.ERROR_LEVEL_INFO;
err.value = error;
@@ -286,7 +302,8 @@ public ServerControlImpl() { inf.access = info.value.access;
inf.maxClients = info.value.maxClients;
inf.actClients = info.value.actClients;
- info.value = inf; }
+ info.value = inf;
+ }
/*
* remove input plugin
|