Menu
▾
▴
[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/predicates OccurrencePredicate.java,1.1,1.2 ReifiesPredicate.java,1.3,1.4
|
From: Lars H. <lh...@us...> - 2005-03-06 21:39:56
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27924/src/org/tmapiutils/query/tolog/predicates Modified Files: OccurrencePredicate.java ReifiesPredicate.java Log Message: More TM4J -> TMAPI translations Index: OccurrencePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/OccurrencePredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OccurrencePredicate.java 6 Mar 2005 17:30:00 -0000 1.1 --- OccurrencePredicate.java 6 Mar 2005 21:39:42 -0000 1.2 *************** *** 16,21 **** import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! import org.tmapi.core.Occurrence; import org.tmapi.core.Topic; /** --- 16,23 ---- import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! // TMAPI import org.tmapi.core.Topic; + import org.tmapi.core.Occurrence; + /** *************** *** 57,65 **** openMatch((Variable)p1, (Variable)p2, ret); } else if ((p1 instanceof Variable) && (p2 instanceof Occurrence)) { ! addResultsRow(ret, new Object[] {((Occurrence)p2).getParent(), p2}); } else if ((p1 instanceof Topic) && (p2 instanceof Variable)) { getOccurrences((Topic)p1, (Variable)p2, ret); } else if ((p1 instanceof Topic) && (p2 instanceof Occurrence)) { ! if (((Occurrence)p2).getParent().equals(p1)) { addResultsRow(ret, new Object[] {p1, p2}); } --- 59,67 ---- openMatch((Variable)p1, (Variable)p2, ret); } else if ((p1 instanceof Variable) && (p2 instanceof Occurrence)) { ! addResultsRow(ret, new Object[] {((Occurrence)p2).getTopic(), p2}); } else if ((p1 instanceof Topic) && (p2 instanceof Variable)) { getOccurrences((Topic)p1, (Variable)p2, ret); } else if ((p1 instanceof Topic) && (p2 instanceof Occurrence)) { ! if (((Occurrence)p2).getTopic().equals(p1)) { addResultsRow(ret, new Object[] {p1, p2}); } *************** *** 98,101 **** --- 100,106 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:39:42 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:30:00 lheuer * Initial tolog import Index: ReifiesPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/ReifiesPredicate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ReifiesPredicate.java 6 Mar 2005 19:37:23 -0000 1.3 --- ReifiesPredicate.java 6 Mar 2005 21:39:42 -0000 1.4 *************** *** 15,24 **** import java.util.List; - import org.tmapi.core.Locator; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! import org.tmapi.core.Topic; import org.tmapi.core.TopicMapObject; /** --- 15,32 ---- import java.util.List; import org.tmapiutils.query.tolog.TologProcessingException; import org.tmapiutils.query.tolog.parser.Variable; import org.tmapiutils.query.tolog.utils.VariableSet; ! // TMAPI ! import org.tmapi.core.Locator; import org.tmapi.core.TopicMapObject; + import org.tmapi.core.TopicMap; + import org.tmapi.core.Topic; + import org.tmapi.core.Association; + import org.tmapi.core.AssociationRole; + import org.tmapi.core.Occurrence; + import org.tmapi.core.TopicName; + import org.tmapi.core.Variant; + /** *************** *** 77,91 **** */ private void closedMatch(Topic topic, TopicMapObject object, VariableSet ret) throws TologProcessingException { ! Locator l = topic.getSubjectLocators(); ! if (l == null) { ! return; ! } ! Iterator it = object.getSourceLocators().iterator(); ! while (it.hasNext()) { ! if (it.next().equals(l)) { ! addResultsRow(ret, new Object[] {topic, object}); ! return; ! } ! } } --- 85,102 ---- */ private void closedMatch(Topic topic, TopicMapObject object, VariableSet ret) throws TologProcessingException { ! if (topic.getReified().contains(object)) { ! addResultsRow(ret, new Object[] {topic, object}); ! } ! // Locator l = topic.getSubjectLocators(); ! // if (l == null) { ! // return; ! // } ! // Iterator it = object.getSourceLocators().iterator(); ! // while (it.hasNext()) { ! // if (it.next().equals(l)) { ! // addResultsRow(ret, new Object[] {topic, object}); ! // return; ! // } ! // } } *************** *** 94,112 **** */ private void openMatch(VariableSet ret) throws TologProcessingException { ! // TODO Add an accessor method to TopicMap to allow access to all topics with a subject locator ! Iterator it = getTopicMap().getTopics().iterator(); ! while (it.hasNext()) { ! Topic t = (Topic)it.next(); ! Iterator si = t.getSubjectIdentifiers().iterator(); ! while (si.hasNext()) { ! Locator l = (Locator)si.next(); ! if (l != null) { ! TopicMapObject reified = getTopicMap().getObjectBySourceLocator(l); ! if (reified != null) { ! addResultsRow(ret, new Object[] {t, reified}); ! } ! } } ! } } --- 105,130 ---- */ private void openMatch(VariableSet ret) throws TologProcessingException { ! Topic topic; ! for (Iterator iter = getTopicMap().getTopics().iterator(); iter.hasNext();) { ! topic = (Topic) iter.next(); ! for (Iterator reifIter = topic.getReified().iterator(); reifIter.hasNext();) { ! addResultsRow(ret, new Object[] {topic, reifIter.next()}); } ! } ! // // TODO Add an accessor method to TopicMap to allow access to all topics with a subject locator ! // Iterator it = getTopicMap().getTopics().iterator(); ! // while (it.hasNext()) { ! // Topic t = (Topic)it.next(); ! // Iterator si = t.getSubjectIdentifiers().iterator(); ! // while (si.hasNext()) { ! // Locator l = (Locator)si.next(); ! // if (l != null) { ! // TopicMapObject reified = getTopicMap().getObjectBySourceLocator(l); ! // if (reified != null) { ! // addResultsRow(ret, new Object[] {t, reified}); ! // } ! // } ! // } ! // } } *************** *** 116,136 **** */ private void getReifier(TopicMapObject object, VariableSet ret) throws TologProcessingException { ! Iterator it = object.getSourceLocators().iterator(); ! while (it.hasNext()) { ! Topic t = getTopicMap().getTopicBySubjectIndicator((Locator)it.next()); ! if (t != null) { ! addResultsRow(ret, new Object[] {t, object}); ! } ! } } private void getReified(Topic reifier, VariableSet ret) throws TologProcessingException { ! Iterator it = reifier.getSubjectIdentifiers().iterator(); ! while (it.hasNext()) { ! TopicMapObject tmo = getTopicMap().getObjectBySourceLocator((Locator)it.next()); ! if (tmo != null) { ! addResultsRow(ret, new Object[] { reifier, tmo }); ! } } } --- 134,180 ---- */ private void getReifier(TopicMapObject object, VariableSet ret) throws TologProcessingException { ! Topic reifier = null; ! if (object instanceof TopicMap) { ! reifier = ((TopicMap) object).getReifier(); ! } ! else if (object instanceof Association) { ! reifier = ((Association) object).getReifier(); ! } ! else if (object instanceof AssociationRole) { ! reifier = ((AssociationRole) object).getReifier(); ! } ! else if (object instanceof Occurrence) { ! reifier = ((Occurrence) object).getReifier(); ! } ! else if (object instanceof TopicName) { ! reifier = ((TopicName) object).getReifier(); ! } ! else if (object instanceof Variant) { ! reifier = ((Variant) object).getReifier(); ! } ! ! if (reifier != null) { ! addResultsRow(ret, new Object[] {t, object}); ! } ! // Iterator it = object.getSourceLocators().iterator(); ! // while (it.hasNext()) { ! // Topic t = getTopicMap().getTopicBySubjectIndicator((Locator)it.next()); ! // if (t != null) { ! // addResultsRow(ret, new Object[] {t, object}); ! // } ! // } } private void getReified(Topic reifier, VariableSet ret) throws TologProcessingException { ! for (Iterator iter = reifier.getReified().iterator(); iter.hasNext();) { ! addResultsRow(ret, new Object[] { reifier, iter.next()}); } + // Iterator it = reifier.getSubjectIdentifiers().iterator(); + // while (it.hasNext()) { + // TopicMapObject tmo = getTopicMap().getObjectBySourceLocator((Locator)it.next()); + // if (tmo != null) { + // addResultsRow(ret, new Object[] { reifier, tmo }); + // } + // } } *************** *** 138,141 **** --- 182,188 ---- /* * $Log$ + * Revision 1.4 2005/03/06 21:39:42 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.3 2005/03/06 19:37:23 lheuer * Changed getTopicByID to getObjectById |
