trivial fix

Author: yoconana

EECS767_05032016.pptx

@@ -1,65 +1,24 @@
-#!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 
 import time
 import signal
 import sys
 import socket
 import os
-
 import process
 import utils
 
-#import togetherIndiceResult
-
-# -------------------------------------------------
-# 基本配置
-# -------------------------------------------------
-LISTEN_PORT = 21230     #服务侦听端口
-CHARSET = "utf-8"       #设置字符集（和PHP交互的字符集）
-
-
 
-# -------------------------------------------------
-# Oracle数据库连接配置
-# -------------------------------------------------
-# import cx_Oracle
-# 数据库字符集
-# os.environ['NLS_LANG'] = 'SIMPLIFIED CHINESE_CHINA.UTF8' 
-# 数据库连接池
-# pool = cx_Oracle.SessionPool(
-#     user='diaoyf',
-#     password='700327',
-#     dsn='127.0.0.1/xe',
-#     min=5,
-#     max=10,
-#     increment=1,
-#     connectiontype=cx_Oracle.Connection,
-#     threaded=True,
-#     getmode=cx_Oracle.SPOOL_ATTRVAL_NOWAIT,
-#     homogeneous=True)
+LISTEN_PORT = 21230     
+CHARSET = "utf-8"      
 
-# def getConn():
-#     """获得数据库连接的公共函数"""
-#     return pool.acquire()
-
-# def closeConn(conn):
-#     """释放数据库连接的公共函数"""
-#     pool.release(conn)
-
-
-# -------------------------------------------------
-# 主程序
-#    请不要随意修改下面的代码
-# -------------------------------------------------
+#build connect between php and pyhon
 if __name__ == '__main__':
 
-    print ("-------------------------------------------")
     print ("- PHP-Python Connection")
     print ("- Time: %s" % time.strftime('%Y-%m-%d %H:%M:%S',time.localtime(time.time())) )
-    print ("-------------------------------------------")
 
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)  #TCP/IP
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) 
     sock.bind(('', LISTEN_PORT))  
     sock.listen(5)  
 
@@ -69,15 +28,11 @@
 
     utils.init_all_data()
     print ("Data Loaded!")
-    #togetherIndiceResult.together_indice_result('ku bast')
 
 
     while 1:
-        connection,address = sock.accept()  #收到一个请求
-
-        #print ("client's IP:%s, PORT:%d" % address)
+        connection,address = sock.accept()  
 
-        # 处理线程
         try:
             process.ProcessThread(connection).start()
         except:

QueryWithTF.pyc

@@ -1,4 +1,13 @@
 # -*- coding: UTF-8 -*-
+
+# -*- coding: UTF-8 -*-
+#-----------------------------------------------------------
+# PPython(PHP and Python).
+#   (2012-15 http://code.google.com/p/ppython/)
+#
+# License: http://www.apache.org/licenses/LICENSE-2.0
+#-----------------------------------------------------------
+
 import sys
 import time
 import threading
@@ -10,14 +19,12 @@
 REQUEST_MIN_LEN = 10
 TIMEOUT = 180
 
-pc_dict = {}        #预编译字典，key:调用模块、函数、参数字符串，值是编译对象
-global_env = {}     #global环境变量
+pc_dict = {}        
+global_env = {} 
 
+# find position of c in bytes
+# pos: the start position
 def index(bytes, c, pos=0):
-    """
-    查找c字符在bytes中的位置(从0开始)，找不到返回-1
-    pos: 查找起始位置
-    """
     for i in range(len(bytes)):
         if (i <= pos):
             continue
@@ -28,48 +35,42 @@ def index(bytes, c, pos=0):
         return -1
 
 
+# encode parameters from python to php
 def z_encode(p):
-    """
-    encode param from python data
-    """
-    if p == None:                               #None->PHP中的NULL
+    if p == None:                               #python None to PHP NULL
         return "N;"
-    elif isinstance(p, int):                    #int->PHP整形
+    elif isinstance(p, int):                    #python int to PHP int
         return "i:%d;" % p
-    elif isinstance(p, str):                    #String->PHP字符串
+    elif isinstance(p, str):                    #python String to PHP String
         p_bytes = p.encode(php_python.CHARSET);
         ret = 's:%d:"' % len(p_bytes)
         ret = ret.encode(php_python.CHARSET)
         ret = ret + p_bytes + '";'.encode(php_python.CHARSET)
         #ret = str(ret, php_python.CHARSET)
         ret = str(ret)
         return ret
-    elif isinstance(p, bool):                   #boolean->PHP布尔
+    elif isinstance(p, bool):                   #python boolean to PHP boolean
         b=1 if p else 0
         return 'b:%d;' % b
-    elif isinstance(p, float):                  #float->PHP浮点
+    elif isinstance(p, float):                  #python float to PHP float
         return 'd:%r;' % p
-    elif isinstance(p, list) or isinstance(p, tuple):        #list,tuple->PHP数组(下标int)
+    elif isinstance(p, list) or isinstance(p, tuple):        #python list,tuple to PHP array with int indice
         s=''
         for pos,i in enumerate(p):
             s+=z_encode(pos)
             s+=z_encode(i)
         return "a:%d:{%s}" % (len(p),s)
-    elif isinstance(p, dict):                   #字典->PHP数组(下标str)
+    elif isinstance(p, dict):                   #python dictionary to PHP array with string indice
         s=''
         for key in p:
             s+=z_encode(key)
             s+=z_encode(p[key])
         return "a:%d:{%s}" % (len(p),s)
-    else:                                       #其余->PHP中的NULL
+    else:                                       #Other types in python to PHP NULL
         return "N;"
 
-
+#decode php parameters from string to python
 def z_decode(p):
-    """
-    decode php param from string to python
-    p: bytes
-    """
     if p[0]==chr(0x4e):                      #NULL 0x4e-'N'
         return None,p[2:]
     elif p[0]==chr(0x62):                    #bool 0x62-'b'
@@ -91,18 +92,18 @@ def z_decode(p):
         #return str(v, php_python.CHARSET), p[end+1:]
         return v.encode(php_python.CHARSET), p[end+1:]
     elif p[0]==chr(0x61):                    #array 0x61-'a'
-        list_=[]       #数组
-        dict_={}       #字典
-        flag=True      #类型，true-元组 false-字典
+        list_=[]       #array
+        dict_={}       #dictionary
+        flag=True      #true-tuple false-dictionary
         second = index(p, chr(0x3a), 2)      # 0x3a-":"
-        num = int(p[2:second])  #元素数量
-        pp = p[second+2:]       #所有元素
+        num = int(p[2:second])  #number of elements
+        pp = p[second+2:]       #all elements
         for i in range(num):
-            key,pp=z_decode(pp)  #key解析
-            if (i == 0): #判断第一个元素key是否int 0
+            key,pp=z_decode(pp)  #key decode
+            if (i == 0): 
                 if (not isinstance(key, int)) or (key != 0):
                     flag = False            
-            val,pp=z_decode(pp)  #value解析
+            val,pp=z_decode(pp)  
             list_.append(val)
             dict_[key]=val
         return (list_, pp[2:]) if flag else (dict_, pp[2:])
@@ -111,144 +112,89 @@ def z_decode(p):
 
 
 def parse_php_req(p):
-    """
-    解析PHP请求消息
-    返回：元组（模块名，函数名，入参list）
-    """
     while p:
-        v,p=z_decode(p)         #v：值  p：bytes(每次z_decode计算偏移量)
+        v,p=z_decode(p)         
         params = v
 
-    modul_func = params[0]      #第一个元素是调用模块和函数名
-    #print("模块和函数名:%s" % modul_func)
-    #print("参数:%s" % params[1:])    
+    modul_func = params[0]        
     pos = modul_func.find("::")
-    modul = modul_func[:pos]    #模块名
-    func = modul_func[pos+2:]   #函数名
+    modul = modul_func[:pos]    
+    func = modul_func[pos+2:]   
     return modul, func, params[1:]   
 
 
 class ProcessThread(threading.Thread):
-    """
-    preThread 处理线程
-    """
     def __init__(self, socket):
         threading.Thread.__init__(self)
-
-        #客户socket
         self._socket = socket
 
-    def run(self):
-
-        #---------------------------------------------------
-        #    1.接收消息
-        #---------------------------------------------------
-        
+    def run(self):        
         try:  
-            self._socket.settimeout(TIMEOUT)                  #设置socket超时时间
-            firstbuf = self._socket.recv(16 * 1024)           #接收第一个消息包(bytes)
-            if len(firstbuf) < REQUEST_MIN_LEN:               #不够消息最小长度
-                #print ("非法包，小于最小长度: %s" % firstbuf)
+            self._socket.settimeout(TIMEOUT)                 
+            firstbuf = self._socket.recv(16 * 1024)          
+            if len(firstbuf) < REQUEST_MIN_LEN:               
                 print 'error message,less than minimum length:',firstbuf
                 self._socket.close()
                 return
 
-            firstComma = index(firstbuf, chr(0x2c))                #查找第一个","分割符
-            #firstComma = index(firstbuf, ',')
+            firstComma = index(firstbuf, chr(0x2c))              
             print firstbuf
-            totalLen = int(firstbuf[0:firstComma])            #消息包总长度
-            #print("消息长度:%d" % totalLen)
+            totalLen = int(firstbuf[0:firstComma])
             print 'message length:',totalLen
             reqMsg = firstbuf[firstComma+1:]
             print 'reqMsg:',reqMsg
             while (len(reqMsg) < totalLen):    
                 reqMsg = reqMsg + self._socket.recv(16 * 1024)
-
-            #调试
-            #print ("请求包：%s" % reqMsg)
-
         except Exception,e:  
-            #print ('接收消息异常', e)
             print 'getMessage error',str(e)
             self._socket.close()
             return
-
-        #---------------------------------------------------
-        #    2.调用模块、函数检查，预编译。
-        #---------------------------------------------------
-
-        #从消息包中解析出模块名、函数名、入参list
         modul, func, params = parse_php_req(reqMsg)
         print 'module:',modul,'func:',func,'parmas:',params
 
-        if (modul not in pc_dict):   #预编译字典中没有此编译模块
-            #检查模块、函数是否存在
+        if (modul not in pc_dict):  
             try:
-                callMod = __import__ (modul)    #根据module名，反射出module
-                pc_dict[modul] = callMod        #预编译字典缓存此模块
+                callMod = __import__ (modul)    
+                pc_dict[modul] = callMod   
             except Exception,e:
                 print 'module not exist:',modul
-                #print ('模块不存在:%s' % modul)
-                self._socket.sendall(("F" + "module '%s' is not exist!" % modul).encode(php_python.CHARSET)) #异常
+                self._socket.sendall(("F" + "module '%s' is not exist!" % modul).encode(php_python.CHARSET)) 
                 self._socket.close()
                 return
         else:
-            callMod = pc_dict[modul]            #从预编译字典中获得模块对象
+            callMod = pc_dict[modul]
 
         try:
             callMethod = getattr(callMod, func)
         except Exception,e:
             print 'function not exist:',func
-            #print ('函数不存在:%s' % func)
             self._socket.sendall(("F" + "function '%s()' is not exist!" % func).encode(php_python.CHARSET)) #异常
             self._socket.close()
             return
-
-        #---------------------------------------------------
-        #    3.Python函数调用
-        #---------------------------------------------------
-
         try: 
             params = ','.join([repr(x) for x in params])         
-            #print ("调用函数及参数：%s(%s)" % (modul+'.'+func, params) )
-            
-            #加载函数
             compStr = "import %s\nret=%s(%s)" % (modul, modul+'.'+func, params)
-            #print("函数调用代码:%s" % compStr)
             rpFunc = compile(compStr, "", "exec")
 
             if func not in global_env: 
                 global_env[func] = rpFunc   
             local_env = {}
-            exec (rpFunc, global_env, local_env)     #函数调用
-            #print (global_env)
-            #print (local_env)
+            exec (rpFunc, global_env, local_env)    
         except Exception,e:  
-            #print ('调用Python业务函数异常', e )
             print 'call python error:',str(e)
             errType, errMsg, traceback = sys.exc_info()
-            self._socket.sendall(("F%s" % errMsg).encode(php_python.CHARSET)) #异常信息返回
+            self._socket.sendall(("F%s" % errMsg).encode(php_python.CHARSET)) 
             self._socket.close()
             return
-
-        #---------------------------------------------------
-        #    4.结果返回给PHP
-        #---------------------------------------------------
-        #retType = type(local_env['ret'])
-        #print ("函数返回：%s" % retType)
-        rspStr = z_encode(local_env['ret'])  #函数结果组装为PHP序列化字符串
+        rspStr = z_encode(local_env['ret'])
 
         try:  
-            #加上成功前缀'S'
             rspStr = "S" + rspStr
-            #调试
-            #print ("返回包：%s" % rspStr)
             self._socket.sendall(rspStr.encode(php_python.CHARSET))
         except Exception,e:
             print 'send message error:',str(e)
-            #print ('发送消息异常', e)
             errType, errMsg, traceback = sys.exc_info()
-            self._socket.sendall(("F%s" % errMsg).encode(php_python.CHARSET)) #异常信息返回
+            self._socket.sendall(("F%s" % errMsg).encode(php_python.CHARSET)) 
         finally:
             self._socket.close()
             return