# SVN changeset patch
# User imanay
# Date 2013-04-29 22:56:10.750902
# Revision 142

changes to integrate to the web interface

Index: trunk/absroot/source/abspy/abscontrol/client3.py
===================================================================
diff --git a/trunk/absroot/source/abspy/abscontrol/client3.py b/trunk/absroot/source/abspy/abscontrol/client3.py
--- a/trunk/absroot/source/abspy/abscontrol/client3.py	(revision 141)
+++ b/trunk/absroot/source/abspy/abscontrol/client3.py	(revision 142)
@@ -40,10 +40,7 @@
      
     def sendFile(self, filename):
         
-#        data = self.abs2ControlModuleFormatFile(filename)
-        tmp = self.__readFile(filename)
-        #Sending content of file and the file name
-        data = filename + '\n' + tmp
+        data = self.__readFile(filename)
         self.__ConnectionWithCentralControl(cmd = "SNDF", data = data)
         
     def changeBeam(self, newBeam):
@@ -61,7 +58,9 @@
         fobj = open(filename,"r")
         listData = fobj.readlines()
         fobj.close()        
-        data = "".join(listData)
+        tmp = "".join(listData)
+        #Adding filename to the begining of the data
+        data = filename + '\n' + tmp
         return data
         
         
Index: trunk/absroot/source/abspy/abscontrol/server3.py
===================================================================
diff --git a/trunk/absroot/source/abspy/abscontrol/server3.py b/trunk/absroot/source/abspy/abscontrol/server3.py
--- a/trunk/absroot/source/abspy/abscontrol/server3.py	(revision 141)
+++ b/trunk/absroot/source/abspy/abscontrol/server3.py	(revision 142)
@@ -145,6 +145,7 @@
     def __sendFile2Modules(self,cmd):
         
         rx_buffer_lst = self.rx_buffer.split('\n',1)
+        #Getting the filename from the begining of data
         filename = rx_buffer_lst[0]
         tmp = rx_buffer_lst[1]
         self.__writeFile(filename,tmp)