Changes comming from PVWS

Signed-off-by: Mariana González Velarde <[email protected]>

Author: zongweiyuan

pv-acsys/src/main/java/org/phoebus/pv/acsys/ACsys_PV.java

@@ -99,13 +99,14 @@ public class ACsys_PV extends PV implements ACsys_PVListener
   //
   public static ACsys_PV fetchDevice(String name, String base_name)
   {
-    logger.log(Level.FINE, "Look for device "+name);
-    ACsys_PV pv = devices.get(name);
+    logger.log(Level.FINER, "Look for device "+name);
+    String key = base_name;
+    ACsys_PV pv = devices.get(key);
     if ( pv == null )
     {
-      logger.log(Level.FINE, "Did not find device "+name+", creating a new PV object");
+      logger.log(Level.INFO , "Did not find device "+key+", creating a new PV object");
       pv = new ACsys_PV(name,base_name);
-      devices.put(base_name,pv); // If an array, we must retain the index
+      devices.put(key ,pv); // If an array, we must retain the index
                                  // after the slash 
     }
     return(pv);
@@ -117,7 +118,7 @@ private ACsys_PV(final String name, final String base_name)
     super(name);
     fullName = name;
 
-    StringTokenizer t = new StringTokenizer(base_name,"/");
+    StringTokenizer t = new StringTokenizer(base_name,"/");   // update from "/"
     deviceName = t.nextToken(); // Should be DRF2 request without the optional array index
 
     // Very special virtual device to enable ACsys settings
@@ -130,6 +131,9 @@ private ACsys_PV(final String name, final String base_name)
       }
     }
 
+    logger.log(Level.FINER, "ACsys_PV "+name+" base_name="+base_name+" dev="+deviceName);
+
+
     // Optional, index to an array
     if ( t.hasMoreTokens() ) { index = Integer.parseInt(t.nextToken());} 
     else                     { index = -1;}
@@ -164,11 +168,11 @@ private ACsys_PV(final String name, final String base_name)
       logger.log(Level.CONFIG,"Adding requests for regular device request "+deviceName);
       for (int i=0; i<dpmFields.length; i++)
       {
-	String baseName = deviceName+dpmFields[i];
+	      String baseName = deviceName+dpmFields[i];
         logger.log(Level.CONFIG,"Adding dpmFields request  "+baseName+" " +i);
-	ACsys_PV pvNew = fetchDevice(ACsys_PVFactory.TYPE+"://"+baseName, baseName);
-	pvNew.dpmFieldsIndex = i;
-	pvNew.addACsys_PVListener(this);
+	      ACsys_PV pvNew = fetchDevice(ACsys_PVFactory.TYPE+"://"+baseName, baseName);
+	      pvNew.dpmFieldsIndex = i;
+	      pvNew.addACsys_PVListener(this);
       }
     }
 

pv-acsys/src/main/java/org/phoebus/pv/acsys/ACsys_PVConn.java

@@ -173,9 +173,8 @@ protected void removeDevice(ACsys_PV pv)
       pvListByName.remove(pv);
       if ( pvListByName.size() <= 0 )
       {
-	requestsByName.remove(deviceNameIndexed);
-	logger.log(Level.FINE,"Removed device "+deviceNameIndexed+" "
-		   +pv.dpmIndex+" from requestByIndex");
+	      requestsByName.remove(deviceNameIndexed);
+	      logger.log(Level.FINE,"Removed device "+deviceNameIndexed+" " +pv.dpmIndex+" from requestByIndex");
       }
     }
   }
@@ -280,8 +279,7 @@ public void handle(DPM.Reply.DeviceInfo devInfo, DPM.Reply.Scalar s)
     pvList.forEach( (pv)->
     {
       // use lamba expression here for string concat
-      logger.log(Level.FINE, "Device "+pv.fullName+ " ref_id "+ devInfo.ref_id+
-		 " " +s.data);
+      logger.log(Level.FINE, "DPM Reply Device "+pv.fullName+ " ref_id "+ devInfo.ref_id+" " +s.data);    
       pv.notify(s.data,s.timestamp);
     });
   }
@@ -312,7 +310,7 @@ public void handle(DPM.Reply.DeviceInfo devInfo, DPM.Reply.BasicStatus s)
     pvList.forEach( (pv)->
     {    
       pv.notify(s.on,s.timestamp);
-      logger.log(Level.FINE,
+      logger.log(Level.FINER,
 		 "Device BasicStatus "+pv.fullName+ " ref_id "+ devInfo.ref_id+
 		 " " +s.on+" "+s.ready);
     });
@@ -334,7 +332,7 @@ public void handle(DPM.Reply.DeviceInfo devInfo, DPM.Reply.Status s)
       {
 	pv.notify(s.status,s.timestamp);
       }
-      logger.log(Level.FINE,
+      logger.log(Level.FINER,
 		 "Device Status "+pv.fullName+ " ref_id "+ s.ref_id+
 		 " " +s.status);
     });
@@ -348,7 +346,7 @@ public void handle(DPM.Reply.DeviceInfo devInfo, DPM.Reply.AnalogAlarm a)
     pvList.forEach( (pv)->
     {
       pv.notify(a.alarm_status,a.timestamp);
-      logger.log(Level.FINE,
+      logger.log(Level.FINER,
 		 "Device AnalogAlarm "+pv.fullName+ " ref_id "+ a.ref_id+
 		 " " +a.alarm_enable+" "+a.alarm_status); 
     });
@@ -361,7 +359,7 @@ public void handle(DPM.Reply.DeviceInfo devInfo, DPM.Reply.DigitalAlarm a)
 
     pvList.forEach( (pv)->
     {    
-      logger.log(Level.FINE,
+      logger.log(Level.FINER,
 		 "Device DigitalAlarm "+pv.deviceName+ " " +
 		 " ref_id "+ a.ref_id+" " +a.alarm_enable+" "+a.alarm_status);
       pv.notify(a.alarm_status,a.timestamp);
@@ -375,7 +373,7 @@ public void handle(DPM.Reply.DeviceInfo devInfo, DPM.Reply.Text t)
 
     pvList.forEach( (pv)->
     {
-      logger.log(Level.FINE,
+      logger.log(Level.FINER,
 	       "Device Text "+pv.fullName+ " ref_id "+ t.ref_id+
 	       " " +t.data);
       pv.notify(t.data,t.timestamp);

pv-acsys/src/main/java/org/phoebus/pv/acsys/ACsys_PVFactory.java

@@ -10,7 +10,7 @@
 
 import org.phoebus.pv.PV;
 import org.phoebus.pv.PVFactory;
-import org.phoebus.pv.acsys.ACsys_PV;
+//import org.phoebus.pv.acsys.ACsys_PV;
 
 /** ACsys implementation of org.phoebus.pv.PVFactory.
  *  @author William Badgett
@@ -29,6 +29,7 @@ public String getType()
   @Override
   public PV createPV(String name, String base_name) throws Exception
   {
+    System.out.println("ACsys_PVFactory.createPV() name=" + name + " base_name=" + base_name);
     return ACsys_PV.fetchDevice(name,base_name);
   }
 }