[Commits] (john) - Fixed bug in d:/John/OSAF/chandler/repository/query/tests/TestSimpleQueries.py

[commits at osafoundation.org]

Commit by: john
Modified files:
chandler/repository/query/Query.py 1.12 1.13
chandler/repository/query/tests/TestSimpleQueries.py 1.12 1.13

Log message:
- Fixed bug in d:/John/OSAF/chandler/repository/query/tests/TestSimpleQueries.py

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/repository/query/Query.py.diff?r1=text&tr1=1.12&r2=text&tr2=1.13
http://cvs.osafoundation.org/index.cgi/chandler/repository/query/tests/TestSimpleQueries.py.diff?r1=text&tr1=1.12&r2=text&tr2=1.13

Index: chandler/repository/query/Query.py
diff -u chandler/repository/query/Query.py:1.12 chandler/repository/query/Query.py:1.13
--- chandler/repository/query/Query.py:1.12	Sat Sep 11 13:03:27 2004
+++ chandler/repository/query/Query.py	Sat Sep 11 16:39:00 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.12 $"
-__date__      = "$Date: 2004/09/11 20:03:27 $"
+__revision__  = "$Revision: 1.13 $"
+__date__      = "$Date: 2004/09/11 23:39:00 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -8,6 +8,7 @@
 import tools.timing
 import sets
 import mx.DateTime.ISO
+from repository.util.UUID import UUID
 
 import logging
 log = logging.getLogger("RepoQuery")
@@ -168,8 +169,17 @@
                 return ('kind', kind)
             if name.startswith('$'): # variable argument
                 itemUUID, attribute = self.args[name]
-                item = self.__rep.find (itemUUID)
-                return ('arg',item.getAttributeValue(attribute))
+                if isinstance (itemUUID, UUID):
+                    item = self.__rep.find (itemUUID)                
+                    if attribute is None:
+                        return ('arg', item)
+                    else:
+                        return ('arg',item.getAttributeValue(attribute))
+                else:
+                    if attribute is None:
+                        return('arg', itemUUID)
+                    else:
+                        return ('arg',item.getAttr(attribute))
             assert False, "lookup_source couldn't handle %s" % name
 
         def compile_predicate(ast):

Index: chandler/repository/query/tests/TestSimpleQueries.py
diff -u chandler/repository/query/tests/TestSimpleQueries.py:1.12 chandler/repository/query/tests/TestSimpleQueries.py:1.13
--- chandler/repository/query/tests/TestSimpleQueries.py:1.12	Thu Sep  2 18:00:00 2004
+++ chandler/repository/query/tests/TestSimpleQueries.py	Sat Sep 11 16:39:00 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.12 $"
-__date__      = "$Date: 2004/09/03 01:00:00 $"
+__revision__  = "$Revision: 1.13 $"
+__date__      = "$Date: 2004/09/11 23:39:00 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -39,7 +39,7 @@
     def testVariableQuery(self):
         """ Test query where source is specified in a variable """
         k = self.rep.findPath('//Schema/Core/Kind')
-        results = self._executeQuery('for i in $1 where contains(i.itsName,"arc")', [k])
+        results = self._executeQuery('for i in $1 where contains(i.itsName,"arc")', {"$1": ([k], None)})
         self._checkQuery(lambda i: not 'arc' in i.itsName, results)
 
     def testNotFunctionKindQuery(self):
@@ -126,11 +126,10 @@
         """ Test a query over ref collections """
         import repository.query.Query as Query
         kind = self.rep.findPath('//Schema/Core/Kind')
-        refcol = kind.attributes
 
         queryString = u"for i in $0 where contains(i.itsName,'ttributes')"
         q = Query.Query(self.rep, queryString)
-        q.args = [ refcol ]
+        q.args ["$0"] = (kind.itsUUID, "attributes")
         q.execute()
 
         self._checkQuery(lambda i: not 'ttributes' in i.itsName, q)