Project

General

Profile

« Previous | Next » 

Revision 1705

Added by Aaron Marcuse-Kubitza almost 13 years ago

ch_root, repl, map: Use new maps.col_info() instead of parsing col name manually. This allows maps with prefixes containing ":" to be supported, without the ":" being misinterpreted as the label-root separator.

View differences:

map
14 14 

  		




  15
  15
  
    
import csvs


  		




  16
  16
  
    
import exc


  		




  
  17
  
    
import maps


  		




  17
  18
  
    
import opts


  		




  18
  19
  
    
import Parser


  		




  19
  20
  
    
import profiling


  		




  ......




  137
  138
  
    
                return label, sep != '', root, prefixes


  		




  138
  139
  
    
                    # extract datasrc from "datasrc[data_format]"


  		




  139
  140
  
    
            


  		




  140
  
  
    
            in_label, in_is_xpaths, in_root, prefixes = split_col_name(in_label)


  		




  
  141
  
    
            in_label, in_root, prefixes = maps.col_info(in_label)


  		




  
  142
  
    
            in_is_xpaths = in_root != None


  		




  141
  143
  
    
            in_label_ref[0] = in_label


  		




  142
  144
  
    
            update_in_label()


  		




  143
  
  
    
            out_label, out_is_xpaths, out_root = split_col_name(out_label)[:3]


  		




  144
  
  
    
            has_types = out_root.startswith('/*s/') # outer elements are types


  		




  
  145
  
    
            out_label, out_root = maps.col_info(out_label)[:2]


  		




  
  146
  
    
            out_is_xpaths = out_root != None


  		




  
  147
  
    
            if out_is_xpaths: has_types = out_root.startswith('/*s/')


  		




  
  148
  
    
                # outer elements are types


  		




  145
  149
  
    
            


  		




  146
  150
  
    
            for row in reader:


  		




  147
  151
  
    
                in_, out = row[:2]


  		












Also available in:  Unified diff