← Back to branch summary

~shikharkohli/sahana-eden/gsoc1

« back to all changes in this revision

Viewing changes to modules/s3xrc.py

  • Committer: Shikhar Kohli
  • Date: 2010-08-11 18:40:09 UTC
  • mfrom: (802.1.156 eden)
  • Revision ID: shikharkohli@gmail.com-20100811184009-yy8zag5dowlam0ip
Merge trunk and update (a bit) of JS

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/s3xrc.py
446
446
 
447
447
 
448
448
    # -------------------------------------------------------------------------
 
449
    def add_filter(self, filter=None):
 
450
 
 
451
        """ Add a filter to the current query """
 
452
 
 
453
        if filter is not None:
 
454
 
 
455
            if self.__query:
 
456
                query = self.__query
 
457
                self.clear()
 
458
                self.clear_query()
 
459
                self.__query = (query) & (filter)
 
460
            else:
 
461
                self.build_query(filter=filter)
 
462
 
 
463
        return self.__query
 
464
 
 
465
 
 
466
    # -------------------------------------------------------------------------
449
467
    def get_query(self):
450
468
 
451
469
        """ Get the current query for this resource """
3242
3260
                error = self.error
3243
3261
                self.error = None
3244
3262
 
3245
 
        self.error = error
 
3263
        if error:
 
3264
            self.error = error
3246
3265
 
3247
3266
        # Commit all vectors
3248
3267
        if self.error is None or ignore_errors:
4000
4019
                text = markup.xpath(".//text()")
4001
4020
                if text:
4002
4021
                    text = " ".join(text)
 
4022
                else:
 
4023
                    text = ""
4003
4024
            except etree.XMLSyntaxError:
4004
4025
                pass
4005
4026
        text = self.xml_encode(text)