Changeset 8347 for mauRepo/HPFos

Timestamp:

13/06/12 23:45:46 (9 years ago)

Author:

mnagni

Message:

 

Location:

mauRepo/HPFos/trunk/src/HPFos/HPFos

Files:

• moles3epb.py (modified) (2 diffs)
• osImpl/myimpl.py (modified) (1 diff)

mauRepo/HPFos/trunk/src/HPFos/HPFos/moles3epb.py

@@ -31 +31 @@
     def _initCEDA_Customization(self):
         self._associateCEDA_GUID()
-        self._initSearchIndexes()        
+        #self._initSearchIndexes()        
         
     def _associateCEDA_GUID(self):
@@ -80 +80 @@
             @return: True if the collection contains the given observation, False otherwise  
         """
-        return self._session.query(CEDA_ObservationCollection.id).all()                
+        return self._session.query(CEDA_ObservationCollection).all()                
         
     def searchEager(self, clazz, inst_id):

mauRepo/HPFos/trunk/src/HPFos/HPFos/osImpl/myimpl.py

@@ -205 +205 @@
         
     def doSearch(self, **kwargs):
-        if kwargs['params_values'] and kwargs['params_values'][COLLECTION] and kwargs['params_values'][OBSERVATION]:
+        if kwargs['params_values'] and kwargs['params_values'].has_key(COLLECTION) and kwargs['params_values'].has_key(OBSERVATION):
             return self.searchObservation(**kwargs)        
         
-        if kwargs['params_values'] and kwargs['params_values'][COLLECTION]:
+        if kwargs['params_values'] and kwargs['params_values'].has_key(COLLECTION):
             return self.searchCollection(**kwargs)