Changeset 303

Show
Ignore:
Timestamp:
06/23/08 08:51:54 (2 months ago)
Author:
frank
Message:

dispatch and orbited.js changes to get legacy apps working

Location:
branches/0.5/daemon/orbited
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • branches/0.5/daemon/orbited/dispatch.py

    r293 r303  
    109109        data, self.buffer = self.buffer.split('\r\n\r\n', 1) 
    110110        protocol, raw_headers = data.split('\r\n', 1) 
     111         
     112        #remove frame type 
     113        frame_type, raw_headers = raw_headers.split('\r\n', 1) 
     114         
     115        logger.info(raw_headers) 
    111116        header_fields =[ d.split(': ') for d in raw_headers.split('\r\n') ] 
    112117        headers = { 'recipients': [ ] } 
     118 
    113119        for (key, val) in header_fields: 
    114120            key = key.lower() 
     
    122128            else: 
    123129                headers[key] = val 
     130 
    124131        self.current_headers = headers 
    125132        self.state = 'body' 
  • branches/0.5/daemon/orbited/static/OrbitedLegacyWrapper.js

    r302 r303  
    22    connect: function (event_cb /* args 1-3 are token parts */) { 
    33        var tokens = Array.prototype.slice.call(arguments, 1) 
    4         var token = tokens.join(', ') 
    5         console.log(token) 
     4        if (tokens.length == 3) 
     5            var token = tokens[0] + ", " + tokens[2] + ', ' + tokens[1] 
     6        else 
     7            var token = tokens[0] 
    68     
    79        var conn = new BaseTCPConnection() 
  • branches/0.5/daemon/orbited/static/orbited.js

    r302 r303  
    695695    connect: function (event_cb /* args 1-3 are token parts */) { 
    696696        var tokens = Array.prototype.slice.call(arguments, 1) 
    697         var token = tokens.join(', ') 
     697        if (tokens.length == 3) 
     698            var token = tokens[0] + ", " + tokens[2] + ', ' + tokens[1] 
     699        else 
     700            var token = tokens[0] 
    698701        console.log(token) 
    699702