Changeset 4600


Ignore:
Timestamp:
11/12/08 14:49:42 (11 years ago)
Author:
cbyrom
Message:

Simplify xquery search.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • exist/trunk/python/ndgUtils/eXistInterface.py

    r4595 r4600  
    171171         
    172172        if providerID and providerID != self.DEFAULT_ALL_VAL: 
    173             whereClause.append("atom:entry/moles:entity/moles:molesISO/moles:providerID = '" + providerID + "'") 
     173            whereClause.append("moles:entity/moles:molesISO/moles:providerID = '" + providerID + "'") 
    174174         
    175175        if atomTypeID and atomTypeID != self.DEFAULT_ALL_VAL: 
    176             whereClause.append("atom:entry/atom:category/@label = '" + atomTypeID + "'") 
     176            whereClause.append("atom:category/@label = '" + atomTypeID + "'") 
    177177             
    178178        if not whereClause: 
     
    185185             
    186186        xquery += "] return <summary> \ 
    187 <id>{$DE/atom:entry/atom:id/text()}</id> \ 
    188 <name>{$DE/atom:entry/atom:title/text()}</name> \ 
    189 <type>{string($DE/atom:entry/atom:category[@term='ATOM_TYPE']/@scheme)}</type> \ 
    190 <subtype>{string($DE/atom:entry/atom:category[@term='ATOM_SUBTYPE']/@scheme)}</subtype> \ 
    191 <href>{string($DE/atom:entry/atom:link[@rel='self']/@href)}</href> \ 
    192 <providerID>{$DE/atom:entry/moles:entity/moles:molesISO/moles:providerID/text()}</providerID> \ 
    193 <created>{$DE/atom:entry/moles:entity/moles:molesISO/moles:created/text()}</created> \ 
     187<id>{$DE/atom:id/text()}</id> \ 
     188<name>{$DE/atom:title/text()}</name> \ 
     189<type>{string($DE/atom:category[@term='ATOM_TYPE']/@scheme)}</type> \ 
     190<subtype>{string($DE/atom:category[@term='ATOM_SUBTYPE']/@scheme)}</subtype> \ 
     191<href>{string($DE/atom:link[@rel='self']/@href)}</href> \ 
     192<providerID>{$DE/moles:entity/moles:molesISO/moles:providerID/text()}</providerID> \ 
     193<created>{$DE/moles:entity/moles:molesISO/moles:created/text()}</created> \ 
    194194</summary>" 
    195195 
Note: See TracChangeset for help on using the changeset viewer.