Changeset 742 for trunk

Show
Ignore:
Timestamp:
02/17/11 11:54:08 (15 months ago)
Author:
mgalloy
Message:

Adding links to parent items in index entries.

Location:
trunk
Files:
11 modified

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r730 r742  
    1 VERSION=3.3.1 
     1VERSION=3.3.2dev 
    22REVISION=-r`svn info | sed -n 's/Revision: \(.*\)/\1/p'` 
    33IDL=idl64 

  • trunk/RELEASE

    r740 r742  
    77* Fix for bug where links to routines, files, etc. in directory overview  
    88  comments on the overview page were not correct. 
     9 
     10* Adding links to parent items in index entries. 
    911 
    1012 

  • trunk/src/tree/doctreeargument__define.pro

    r727 r742  
    7272        self.routine->getProperty, file=file, name=routineName 
    7373        file->getProperty, basename=basename 
     74 
     75        type_tree = obj_new('MGtmTag') 
     76        type_tree->addChild, obj_new('MGtmText', text=type + ' in routine ') 
    7477         
    75         msg = '(%"%s in routine %s in file %s")' 
    76         return, string(format=msg, type, routineName, basename) 
     78        routine_node = obj_new('MGtmTag', type='link') 
     79        routine_node->addAttribute, 'reference', self.routine->getVariable('index_url') 
     80        routine_node->addChild, obj_new('MGtmText', text=routineName) 
     81        type_tree->addChild, routine_node 
     82 
     83        type_tree->addChild, obj_new('MGtmText', text=' in file ') 
     84 
     85        file_node = obj_new('MGtmTag', type='link') 
     86        file_node->addAttribute, 'reference', file->getVariable('index_url') 
     87        file_node->addChild, obj_new('MGtmText', text=basename) 
     88        type_tree->addChild, file_node 
     89         
     90        comments = self.system->processComments(type_tree) 
     91        obj_destroy, type_tree 
     92 
     93        return, comments 
    7794      end       
    7895    'index_url': begin 

  • trunk/src/tree/doctreedlmfile__define.pro

    r670 r742  
    6262     
    6363    'index_name': return, self.basename 
    64     'index_type': return, '.dlm file in ' + self->getVariable('location') 
     64    'index_type': begin 
     65        location = self.directory->getVariable('location') 
     66         
     67        type_tree = obj_new('MGtmTag') 
     68        type_tree->addChild, obj_new('MGtmText', text='.dlm file in ') 
     69        link_node = obj_new('MGtmTag', type='link') 
     70        link_node->addAttribute, 'reference', self.directory->getVariable('index_url') 
     71        link_node->addChild, obj_new('MGtmText', text=location + ' directory') 
     72        type_tree->addChild, link_node 
     73        comments = self.system->processComments(type_tree) 
     74        obj_destroy, type_tree 
     75 
     76        return, comments 
     77      end 
    6578    'index_url': begin 
    6679        return, self.directory->getVariable('url') + self->getVariable('local_url') 

  • trunk/src/tree/doctreefield__define.pro

    r727 r742  
    5959    'index_type': begin 
    6060        self.class->getProperty, classname=classname 
    61         return, 'field in class ' + classname 
     61         
     62        type_tree = obj_new('MGtmTag') 
     63        type_tree->addChild, obj_new('MGtmText', text='field in class ') 
     64        link_node = obj_new('MGtmTag', type='link') 
     65        link_node->addAttribute, 'reference', self.class->getVariable('index_url') 
     66        link_node->addChild, obj_new('MGtmText', text=classname) 
     67        type_tree->addChild, link_node 
     68        comments = self.system->processComments(type_tree) 
     69        obj_destroy, type_tree 
     70 
     71        return, comments 
    6272      end      
    6373    'index_url': return, self.class->getVariable('url') 

  • trunk/src/tree/doctreeidldocfile__define.pro

    r678 r742  
    100100    'index_name': return, self.basename 
    101101    'index_type': begin 
    102         return, '.idldoc file in ' + self.directory->getVariable('location') + ' directory' 
     102        location = self.directory->getVariable('location') 
     103         
     104        type_tree = obj_new('MGtmTag') 
     105        type_tree->addChild, obj_new('MGtmText', text='.idldoc file in ') 
     106        link_node = obj_new('MGtmTag', type='link') 
     107        link_node->addAttribute, 'reference', self.directory->getVariable('index_url') 
     108        link_node->addChild, obj_new('MGtmText', text=location + ' directory') 
     109        type_tree->addChild, link_node 
     110        comments = self.system->processComments(type_tree) 
     111        obj_destroy, type_tree 
     112 
     113        return, comments 
    103114      end       
    104115    'index_url': begin 

  • trunk/src/tree/doctreeprofile__define.pro

    r728 r742  
    368368    'index_name': return, self.basename 
    369369    'index_type': begin 
    370         return, '.pro file in ' + self.directory->getVariable('location') + ' directory' 
     370        location = self.directory->getVariable('location') 
     371         
     372        type_tree = obj_new('MGtmTag') 
     373        type_tree->addChild, obj_new('MGtmText', text='.pro file in ') 
     374        link_node = obj_new('MGtmTag', type='link') 
     375        link_node->addAttribute, 'reference', self.directory->getVariable('index_url') 
     376        link_node->addChild, obj_new('MGtmText', text=location + ' directory') 
     377        type_tree->addChild, link_node 
     378        comments = self.system->processComments(type_tree) 
     379        obj_destroy, type_tree 
     380 
     381        return, comments 
    371382      end       
    372383    'index_url': begin 

  • trunk/src/tree/doctreeproperty__define.pro

    r727 r742  
    116116    'index_type': begin 
    117117        self.class->getProperty, classname=classname 
    118         return, 'property in class ' + classname 
     118         
     119        type_tree = obj_new('MGtmTag') 
     120        type_tree->addChild, obj_new('MGtmText', text='property in class ') 
     121        link_node = obj_new('MGtmTag', type='link') 
     122        link_node->addAttribute, 'reference', self.class->getVariable('index_url') 
     123        link_node->addChild, obj_new('MGtmText', text=classname) 
     124        type_tree->addChild, link_node 
     125        comments = self.system->processComments(type_tree) 
     126        obj_destroy, type_tree 
     127 
     128        return, comments 
    119129      end 
    120130         

  • trunk/src/tree/doctreeroutine__define.pro

    r670 r742  
    456456    'index_type': begin 
    457457        self.file->getProperty, basename=basename 
    458         return, 'routine in ' + basename 
     458         
     459        type_tree = obj_new('MGtmTag') 
     460        type_tree->addChild, obj_new('MGtmText', text='routine in ') 
     461        link_node = obj_new('MGtmTag', type='link') 
     462        link_node->addAttribute, 'reference', self.file->getVariable('index_url') 
     463        link_node->addChild, obj_new('MGtmText', text=basename) 
     464        type_tree->addChild, link_node 
     465        comments = self.system->processComments(type_tree) 
     466        obj_destroy, type_tree 
     467 
     468        return, comments 
    459469      end 
    460470    'index_url': begin 

  • trunk/src/tree/doctreesavfile__define.pro

    r670 r742  
    9090     
    9191    'index_name': return, self.basename 
    92     'index_type': return, '.sav file in ' + self->getVariable('location') 
     92    'index_type': begin 
     93        location = self.directory->getVariable('location') 
     94         
     95        type_tree = obj_new('MGtmTag') 
     96        type_tree->addChild, obj_new('MGtmText', text='.sav file in ') 
     97        link_node = obj_new('MGtmTag', type='link') 
     98        link_node->addAttribute, 'reference', self.directory->getVariable('index_url') 
     99        link_node->addChild, obj_new('MGtmText', text=location + ' directory') 
     100        type_tree->addChild, link_node 
     101        comments = self.system->processComments(type_tree) 
     102        obj_destroy, type_tree 
     103 
     104        return, comments 
     105      end 
    93106    'index_url': begin 
    94107        return, self.directory->getVariable('url') + self->getVariable('local_url') 

  • trunk/src/tree/doctreesavvar__define.pro

    r670 r742  
    3737       
    3838    'index_name': return, self.name 
    39     'index_type': return, 'variable in .sav file ' + self.savFile->getVariable('basename') 
     39    'index_type': begin 
     40        basename = self.savFile->getVariable('basename') 
     41         
     42        type_tree = obj_new('MGtmTag') 
     43        type_tree->addChild, obj_new('MGtmText', text='variable in .sav file ') 
     44        link_node = obj_new('MGtmTag', type='link') 
     45        link_node->addAttribute, 'reference', self.savFile->getVariable('index_url') 
     46        link_node->addChild, obj_new('MGtmText', text=basename) 
     47        type_tree->addChild, link_node 
     48        comments = self.system->processComments(type_tree) 
     49        obj_destroy, type_tree 
     50         
     51        return, comments 
     52      end 
    4053    'index_url': begin 
    4154        self.savFile->getProperty, directory=directory