Menu
▾
▴
[uts-cvs] uts/src/tel/telgo.paramount telgo,1.2,1.3 telgo.paramount.py,1.2,1.3 telgo.server.py,1.2,1.3
|
From: Paulo H. S. de S. <ph...@us...> - 2004-05-26 00:07:05
|
Update of /cvsroot/uts/uts/src/tel/telgo.paramount In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27485/src/tel/telgo.paramount Modified Files: telgo telgo.paramount.py telgo.server.py Log Message: - adicionado formulario para configuracao de diretorios padrao - reforma no telgo.paramount.py - display.php e download.php nao dependem mais de paths, tudo usa as configuracoes da sessao Index: telgo =================================================================== RCS file: /cvsroot/uts/uts/src/tel/telgo.paramount/telgo,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** telgo 18 Mar 2004 16:06:00 -0000 1.2 --- telgo 26 May 2004 00:06:56 -0000 1.3 *************** *** 22,37 **** """ % (__description__, __version__, __date__, ! sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0]) sys.exit(-1) - - - - # get target host and port from command line if ":" in sys.argv[2]: target = string.split(sys.argv[2], ":") elif sys.argv[2] != "-": target = [sys.argv[2], 10000] --- 22,34 ---- """ % (__description__, __version__, __date__, ! sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0]) sys.exit(-1) # get target host and port from command line if ":" in sys.argv[2]: target = string.split(sys.argv[2], ":") + target[1] = int(target[1]) elif sys.argv[2] != "-": target = [sys.argv[2], 10000] *************** *** 50,63 **** skt = socket(AF_INET, SOCK_STREAM) ! print "Connecting to %s:%d... wait... " % tuple(target), sys.stdout.flush() skt.connect(tuple(target)) print "OK" ! skt.sendall("RA*%s" % targetRA) ! skt.sendall("DEC*%s" % targetDEC) ! skt.sendall("MOVE") ! print "Moving to %s %s... wait... " % (targetRA, targetDEC), sys.stdout.flush() --- 47,58 ---- skt = socket(AF_INET, SOCK_STREAM) ! print "Connecting to %s:%d... wait... " % tuple(target) sys.stdout.flush() skt.connect(tuple(target)) print "OK" ! skt.sendall("%s*%s*MOVE" % (targetRA, targetDEC)) ! print "Moving to %s %s... wait... " % (targetRA, targetDEC) sys.stdout.flush() *************** *** 88,92 **** except error, e: print "ERROR (%s)" % (e[1]) ! skt.sendall("BYE") skt.close() sys.exit(1) --- 83,87 ---- except error, e: print "ERROR (%s)" % (e[1]) ! #skt.sendall("BYE") skt.close() sys.exit(1) Index: telgo.paramount.py =================================================================== RCS file: /cvsroot/uts/uts/src/tel/telgo.paramount/telgo.paramount.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** telgo.paramount.py 18 Mar 2004 16:06:00 -0000 1.2 --- telgo.paramount.py 26 May 2004 00:06:56 -0000 1.3 *************** *** 22,37 **** """ % (__description__, __version__, __date__, ! sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0]) sys.exit(-1) - - - - # get target host and port from command line if ":" in sys.argv[2]: target = string.split(sys.argv[2], ":") elif sys.argv[2] != "-": target = [sys.argv[2], 10000] --- 22,34 ---- """ % (__description__, __version__, __date__, ! sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0]) sys.exit(-1) # get target host and port from command line if ":" in sys.argv[2]: target = string.split(sys.argv[2], ":") + target[1] = int(target[1]) elif sys.argv[2] != "-": target = [sys.argv[2], 10000] *************** *** 50,63 **** skt = socket(AF_INET, SOCK_STREAM) ! print "Connecting to %s:%d... wait... " % tuple(target), sys.stdout.flush() skt.connect(tuple(target)) print "OK" ! skt.sendall("RA*%s" % targetRA) ! skt.sendall("DEC*%s" % targetDEC) ! skt.sendall("MOVE") ! print "Moving to %s %s... wait... " % (targetRA, targetDEC), sys.stdout.flush() --- 47,58 ---- skt = socket(AF_INET, SOCK_STREAM) ! print "Connecting to %s:%d... wait... " % tuple(target) sys.stdout.flush() skt.connect(tuple(target)) print "OK" ! skt.sendall("%s*%s*MOVE" % (targetRA, targetDEC)) ! print "Moving to %s %s... wait... " % (targetRA, targetDEC) sys.stdout.flush() *************** *** 88,92 **** except error, e: print "ERROR (%s)" % (e[1]) ! skt.sendall("BYE") skt.close() sys.exit(1) --- 83,87 ---- except error, e: print "ERROR (%s)" % (e[1]) ! #skt.sendall("BYE") skt.close() sys.exit(1) Index: telgo.server.py =================================================================== RCS file: /cvsroot/uts/uts/src/tel/telgo.paramount/telgo.server.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** telgo.server.py 18 Mar 2004 16:06:00 -0000 1.2 --- telgo.server.py 26 May 2004 00:06:56 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- #!/bin/python # -*- coding: cp1252 -*- + import sys import time *************** *** 47,67 **** if not data: continue ! if data == 'MOVE': ! print "moving to %s %s" % (targetRA, targetDEC) ! sys.stdout.flush() ! ! obj.SlewToCoordinates(util.HMSToHours(targetRA), util.DMSToDegrees(targetDEC)) ! ! conn.send("OK") ! sys.stdout.flush() ! elif data.count("RA"): ! targetRA = data.split('*')[1] ! print "setting RA to %s" % targetRA ! sys.stdout.flush() ! elif data.count("DEC"): ! targetDEC = data.split('*')[1] ! print "setting DEC to %s" % targetDEC ! sys.stdout.flush() ! elif data == "BYE": conn.close() break --- 48,52 ---- if not data: continue ! if data == "BYE": conn.close() break *************** *** 71,75 **** thesky.Quit() fim = True ! break print "Saindo... %s:%d\n" % addr --- 56,79 ---- thesky.Quit() fim = True ! break ! ! else: ! target = data.split('*') ! ! targetRA = target[0] ! print "setting RA to %s" % targetRA ! sys.stdout.flush() ! ! targetDEC = target[1] ! print "setting DEC to %s" % targetDEC ! sys.stdout.flush() ! ! print "moving to %s %s" % (targetRA, targetDEC) ! sys.stdout.flush() ! ! obj.SlewToCoordinates(util.HMSToHours(targetRA), util.DMSToDegrees(targetDEC)) ! ! conn.send("OK") ! sys.stdout.flush() print "Saindo... %s:%d\n" % addr |
