Menu
▾
▴
[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/predicates DirectInstanceOfPredicate.java,1.1,1.2 DynamicAssociationPredicate.java,1.1,1.2
|
From: Lars H. <lh...@us...> - 2005-03-06 21:01:18
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17744/src/org/tmapiutils/query/tolog/predicates Modified Files: DirectInstanceOfPredicate.java DynamicAssociationPredicate.java Log Message: Removed getIndexManager() with getHelperObject(index.class) Index: DirectInstanceOfPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/DirectInstanceOfPredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DirectInstanceOfPredicate.java 6 Mar 2005 17:29:58 -0000 1.1 --- DirectInstanceOfPredicate.java 6 Mar 2005 21:01:07 -0000 1.2 *************** *** 15,26 **** --- 15,33 ---- import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.tmapiutils.query.tolog.TologParserException; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + + import org.tmapiutils.utils.IndexUtils; + + // TMAPI import org.tmapi.core.Topic; import org.tmapi.core.TopicMap; + import org.tmapi.core.TMAPIException; import org.tmapi.index.core.TopicsIndex; + /** * Implementation of the tolog built-in direct-instance-of *************** *** 68,74 **** super.initialise(tm); try { ! m_tti = tm.getIndexManager().getTopicsIndex(); ! if (!m_tti.isOpen()) m_tti.open(); ! } catch (Exception ex) { throw new TologParserException("Unable to initialise " + PREDICATE_NAME + " predicate.", ex); } --- 75,80 ---- super.initialise(tm); try { ! m_tti = (TopicsIndex) tm.getHelperObject(TopicsIndex.class); ! } catch (TMAPIException ex) { throw new TologParserException("Unable to initialise " + PREDICATE_NAME + " predicate.", ex); } *************** *** 165,168 **** --- 171,175 ---- */ private void getInstances(Topic cls, VariableSet ret) throws TologProcessingException { + IndexUtils.updateIndex(m_tti); Iterator it = m_tti.getTopicsByType(cls).iterator(); while (it.hasNext()) { *************** *** 192,195 **** --- 199,203 ---- */ private void openMatch(VariableSet ret) throws TologProcessingException { + IndexUtils.updateIndex(m_tti); Iterator types = m_tti.getTopicTypes().iterator(); while (types.hasNext()) { *************** *** 205,208 **** --- 213,219 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:01:07 lheuer + * Removed getIndexManager() with getHelperObject(index.class) + * * Revision 1.1 2005/03/06 17:29:58 lheuer * Initial tolog import Index: DynamicAssociationPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/DynamicAssociationPredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DynamicAssociationPredicate.java 6 Mar 2005 17:29:58 -0000 1.1 --- DynamicAssociationPredicate.java 6 Mar 2005 21:01:07 -0000 1.2 *************** *** 26,42 **** import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; import org.tmapi.core.Association; import org.tmapi.core.AssociationRole; import org.tmapi.core.Topic; import org.tmapi.core.TopicMap; ! import org.tmapi.core.index.IndexException; ! import org.tmapi.core.index.IndexManagerException; ! import org.tmapi.index.core.AssociationTypesIndex; import org.tmapi.index.core.AssociationRolesIndex; - import org.tmapi.core.utils.extractors.AssociationExtractor; - import org.tmapi.core.utils.testers.TypeTester; - - import uk.co.jezuk.mango.iterators.PredicatedIterator; - import uk.co.jezuk.mango.iterators.TransformingIterator; /** --- 26,49 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; + //import org.tmapi.core.index.IndexException; + //import org.tmapi.core.index.IndexManagerException; + //import org.tmapi.index.core.AssociationTypesIndex; + //import org.tmapi.index.core.AssociationRolesIndex; + //import org.tmapi.core.utils.extractors.AssociationExtractor; + //import org.tmapi.core.utils.testers.TypeTester; + + import uk.co.jezuk.mango.iterators.PredicatedIterator; + import uk.co.jezuk.mango.iterators.TransformingIterator; + + import org.tmapiutils.utils.IndexUtils; + + // TMAPI import org.tmapi.core.Association; import org.tmapi.core.AssociationRole; import org.tmapi.core.Topic; import org.tmapi.core.TopicMap; ! import org.tmapi.core.TMAPIException; ! import org.tmapi.index.core.AssociationsIndex; import org.tmapi.index.core.AssociationRolesIndex; /** *************** *** 48,53 **** private TopicMap m_tm; private Topic m_assocType = null; ! private AssociationTypesIndex m_ati; ! private AssociationRolesIndex m_mti; private static final Log m_log = LogFactory.getLog(DynamicAssociationPredicate.class); --- 55,60 ---- private TopicMap m_tm; private Topic m_assocType = null; ! private AssociationsIndex _assocIdx; ! private AssociationRolesIndex _roleIdx; private static final Log m_log = LogFactory.getLog(DynamicAssociationPredicate.class); *************** *** 57,69 **** m_tm = tm; try { ! m_ati = tm.getIndexManager().getAssociationTypesIndex(); ! if (!m_ati.isOpen()) m_ati.open(); ! m_mti = tm.getIndexManager().getAssociationRolesIndex(); ! if (!m_mti.isOpen()) m_mti.open(); } ! catch (IndexManagerException e) { ! throw new TologParserException("Unable to open indexes requred for AssociationPredicate", e); ! } catch (IndexException e) { ! throw new TologParserException("Unable to open indexes requred for AssociationPredicate", e); } } --- 64,72 ---- m_tm = tm; try { ! _assocIdx = (AssociationsIndex) tm.getHelperObject(AssociationsIndex.class); ! _roleIdx = (AssociationRolesIndex) tm.getHelperObject(AssociationRolesIndex.class); } ! catch (TMAPIException e) { ! throw new TologParserException("Unable to get indexes requred for AssociationPredicate", e); } } *************** *** 129,134 **** */ private VariableSet matchOnRoleType(Topic roleType, List params) throws TologProcessingException { ! Collection members = m_mti.getAssociationRolesOfType(roleType); ! return matchAssociations(new TransformingIterator(members.iterator(), new AssociationExtractor()), params); } --- 132,138 ---- */ private VariableSet matchOnRoleType(Topic roleType, List params) throws TologProcessingException { ! IndexUtils.updateIndex(_roleIdx); ! Collection roles = _roleIdx.getAssociationRolesByType(roleType); ! return matchAssociations(new TransformingIterator(roles.iterator(), new AssociationExtractor()), params); } *************** *** 138,142 **** */ private VariableSet matchOnAssocType(List params) throws TologProcessingException { ! Collection assocsToMatch = m_ati.getAssociationsByType((Topic)params.get(0)); return matchAssociations(assocsToMatch.iterator(), params); } --- 142,147 ---- */ private VariableSet matchOnAssocType(List params) throws TologProcessingException { ! IndexUtils.updateIndex(_assocIdx); ! Collection assocsToMatch = _assocIdx.getAssociationsByType((Topic)params.get(0)); return matchAssociations(assocsToMatch.iterator(), params); } *************** *** 362,371 **** Iterator it = assoc.getAssociationRoles().iterator(); while (it.hasNext()) { ! AssociationRole m = (AssociationRole)it.next(); ! Topic roleSpec = m.getType(); ! Iterator players = m.getPlayers().iterator(); ! while (players.hasNext()) { ! ret.add(new PlayerRolePair((Topic)players.next(), roleSpec)); ! } } return ret; --- 367,377 ---- Iterator it = assoc.getAssociationRoles().iterator(); while (it.hasNext()) { ! AssociationRole role = (AssociationRole)it.next(); ! Topic type = m.getType(); ! // Iterator players = m.getPlayers().iterator(); ! //while (players.hasNext()) { ! // ret.add(new PlayerRolePair((Topic)players.next(), roleSpec)); ! //} ! ret.add(new PlayerRolePair(role.getPlayer(), type)) } return ret; *************** *** 446,449 **** --- 452,458 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:01:07 lheuer + * Removed getIndexManager() with getHelperObject(index.class) + * * Revision 1.1 2005/03/06 17:29:58 lheuer * Initial tolog import |
