[Magicmap-commits] magicmapserver/src/net/sf/magicmap/server/facade PositionFacade2.java,1.15,1.16

[Florian L. <fle...@us...>]

Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4583/src/net/sf/magicmap/server/facade

Modified Files:
	PositionFacade2.java 
Log Message:


Index: PositionFacade2.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade2.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PositionFacade2.java	7 Mar 2006 17:24:28 -0000	1.15
--- PositionFacade2.java	29 Mar 2006 10:05:43 -0000	1.16
***************
*** 2,7 ****
  package net.sf.magicmap.server.facade;
  
- import java.io.FileNotFoundException;
- import java.io.FileOutputStream;
  import java.io.FileWriter;
  import java.rmi.RemoteException;
--- 2,5 ----
***************
*** 27,31 ****
  
  import org.apache.log4j.Category;
- import org.apache.log4j.FileAppender;
  
  public class PositionFacade2 implements PositionFacadeInterface {
--- 25,28 ----
***************
*** 96,100 ****
      pos.setPosY(positionY);
      PositionCache.getPositionCache().createOrUpdatePosition(map, pos, client.getMac());
!     
      FileWriter fw;
      String string;
--- 93,97 ----
      pos.setPosY(positionY);
      PositionCache.getPositionCache().createOrUpdatePosition(map, pos, client.getMac());
! 
      FileWriter fw;
      String string;
***************
*** 103,118 ****
        fw = new FileWriter("referenzpunkt.txt", true);
        while (i < character.getSimpleScanResults().length){
!         string = "TimeStamp: " + System.currentTimeMillis() 
!             + " SessionID: " + sessionId
!             + " PositionName: " + positionName
!             + " MapName: " + mapName
!             + " Postition.X " + positionX
!             + " Postition.Y " + positionY
!             + " Fixed: " + fixed
!             + " Character.getMacAP " + character.getSimpleScanResults()[i].getMacAP()
!             + " Character.LastSeen: " + character.getSimpleScanResults()[i].getLastSeen()
!             + " Character.noise " + character.getSimpleScanResults()[i].getNoise()
!             + " Character.SignalLevel: " + character.getSimpleScanResults()[i].getSignalLevel()
!             +  " \n";
          fw.write(string, 0, string.length());
          ++i;
--- 100,109 ----
        fw = new FileWriter("referenzpunkt.txt", true);
        while (i < character.getSimpleScanResults().length){
!         string = "TimeStamp: " + System.currentTimeMillis() + " SessionID: " + sessionId + " PositionName: "
!             + positionName + " MapName: " + mapName + " Postition.X " + positionX + " Postition.Y " + positionY
!             + " Fixed: " + fixed + " Character.getMacAP " + character.getSimpleScanResults()[i].getMacAP()
!             + " Character.LastSeen: " + character.getSimpleScanResults()[i].getLastSeen() + " Character.noise "
!             + character.getSimpleScanResults()[i].getNoise() + " Character.SignalLevel: "
!             + character.getSimpleScanResults()[i].getSignalLevel() + " \n";
          fw.write(string, 0, string.length());
          ++i;
***************
*** 250,254 ****
        SignalCharacterDTO character, String clientMac, boolean fixed) throws SessionException, MapException{
      this.logger.info("createOrUpdateClientPosition()");
- 
      PersistenceManager pm = null;
      try{
--- 241,244 ----
***************
*** 312,327 ****
        fw = new FileWriter("client.txt", true);
        while (i < character.getSimpleScanResults().length){
!         string = "TimeStamp: " + System.currentTimeMillis() 
!             + " SessionID: " + sessionId
!             + " ClientMAC: " + clientMac
!             + " MapName: " + mapName
!             + " Postition.X " + positionX
!             + " Postition.Y " + positionY
!             + " Fixed: " + fixed
!             + " Character.MacAP " + character.getSimpleScanResults()[i].getMacAP()
!             + " Character.LastSeen: " + character.getSimpleScanResults()[i].getLastSeen()
!             + " Character.noise " + character.getSimpleScanResults()[i].getNoise()
!             + " Character.SignalLevel: " + character.getSimpleScanResults()[i].getSignalLevel()
!             +  " \n";
          fw.write(string, 0, string.length());
          ++i;
--- 302,311 ----
        fw = new FileWriter("client.txt", true);
        while (i < character.getSimpleScanResults().length){
!         string = "TimeStamp: " + System.currentTimeMillis() + " SessionID: " + sessionId + " ClientMAC: " + clientMac
!             + " MapName: " + mapName + " Postition.X " + positionX + " Postition.Y " + positionY + " Fixed: " + fixed
!             + " Character.MacAP " + character.getSimpleScanResults()[i].getMacAP() + " Character.LastSeen: "
!             + character.getSimpleScanResults()[i].getLastSeen() + " Character.noise "
!             + character.getSimpleScanResults()[i].getNoise() + " Character.SignalLevel: "
!             + character.getSimpleScanResults()[i].getSignalLevel() + " \n";
          fw.write(string, 0, string.length());
          ++i;
***************
*** 444,449 ****
     * @see net.sf.magicmap.server.facade.interfaces.PositionFacadeInterface#getPositionsForMapSince(long, java.lang.String, long)
     */
!   public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws MapException,
!       SessionException{
      this.logger.info("getPositionsForMapSince() " + timeStamp);
      PositionDTO[] result = null;
--- 428,433 ----
     * @see net.sf.magicmap.server.facade.interfaces.PositionFacadeInterface#getPositionsForMapSince(long, java.lang.String, long)
     */
!   public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp, boolean timeflag)
!       throws MapException, SessionException{
      this.logger.info("getPositionsForMapSince() " + timeStamp);
      PositionDTO[] result = null;
***************
*** 454,458 ****
        checkSession(sessionId, pm);
        Map map = checkMap(mapName, pm);
!       result = PositionCache.getPositionCache().getPositionsForMapSince(map, timeStamp);
        if (pm.currentTransaction().isActive()){
          pm.currentTransaction().commit();
--- 438,442 ----
        checkSession(sessionId, pm);
        Map map = checkMap(mapName, pm);
!       result = PositionCache.getPositionCache().getPositionsForMapSince(map, timeStamp, timeflag);
        if (pm.currentTransaction().isActive()){
          pm.currentTransaction().commit();
***************
*** 517,529 ****
        pm.currentTransaction().begin();
        checkSession(sessionId, pm);
!       AccessPoint ap = findOrCreateAccessPoint(accessPointMac,pm);
        ap.setHidden(hidden);
!       
        Map map = checkMap(mapName, pm);
        PositionDTO pos = PositionCache.getPositionCache().getPositionForClientOnMap(map, accessPointMac);
        if (pos != null && pos.getAccessPoint() != null){
!       pos.getAccessPoint().setHidden(hidden);
!       PositionCache.getPositionCache().createOrUpdatePosition(map, pos);
!       }else {
          pos = new PositionDTO();
          if (ap != null){
--- 501,513 ----
        pm.currentTransaction().begin();
        checkSession(sessionId, pm);
!       AccessPoint ap = findOrCreateAccessPoint(accessPointMac, pm);
        ap.setHidden(hidden);
! 
        Map map = checkMap(mapName, pm);
        PositionDTO pos = PositionCache.getPositionCache().getPositionForClientOnMap(map, accessPointMac);
        if (pos != null && pos.getAccessPoint() != null){
!         pos.getAccessPoint().setHidden(hidden);
!         PositionCache.getPositionCache().createOrUpdatePosition(map, pos);
!       } else{
          pos = new PositionDTO();
          if (ap != null){
***************
*** 540,544 ****
          PositionCache.getPositionCache().createOrUpdatePosition(map, pos);
        }
!       
        pm.currentTransaction().commit();
      } catch (Exception e){
--- 524,528 ----
          PositionCache.getPositionCache().createOrUpdatePosition(map, pos);
        }
! 
        pm.currentTransaction().commit();
      } catch (Exception e){