Changeset 4979 for MILK


Ignore:
Timestamp:
16/02/09 10:58:55 (10 years ago)
Author:
cbyrom
Message:

Update discovery client to cope with atom docs properly - interpreting
their ids correctly to create the necessary browse URL.

Location:
MILK/trunk/milk_server/milk_server
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • MILK/trunk/milk_server/milk_server/controllers/atom_editor/atomeditorcontroller.py

    r4964 r4979  
    7373        edc = Utilities.getExistClient(c.atom.ME.providerID) 
    7474        c.atom.state = edc.getAtomPublicationState(c.atom.datasetID,  
    75                                                    c.atom.ME.providerID)         
     75                                                   c.atom.ME.providerID) 
    7676        # save the current atom - to avoid this needing be recreated by the  
    7777        # asynch viewAssociatedData call 
  • MILK/trunk/milk_server/milk_server/controllers/browse/discovery.py

    r4959 r4979  
    387387        c.searchTarget=self.inputs['searchTarget'] 
    388388        for r in c.results: 
    389             n=ndgObject(r.id,config=self.cf) 
     389            id = r.id 
     390                # cope with atom docs 
     391            if id.startswith('tag'): 
     392                id = id.split('/')[-1] 
     393            n=ndgObject(id,config=self.cf) 
    390394            r.link={'Browse':n.BURL,'NumSim':n.URL}[c.searchTarget] 
    391395         
  • MILK/trunk/milk_server/milk_server/templates/browse/short_results.kid

    r4487 r4979  
    88        <td><a href="${item.link}">${item.name}</a></td><td>${item.type}</td> 
    99    </tr> 
     10     
    1011    <div id="entirepage"> 
    1112        <div py:replace="header()"/> 
Note: See TracChangeset for help on using the changeset viewer.